aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormrjive <mrjive@mrjive.it>2016-01-28 23:19:13 +0100
committermrjive <mrjive@mrjive.it>2016-01-28 23:19:13 +0100
commit28943af494eae225b256b9771a5699a1b05d7a2f (patch)
tree1f135da64c0935053f468281f8353e8279a18448
parentc49e4f52ae83441c4a1dcf52e433dded8d767679 (diff)
parent5f1eb18da4d6380b64e83e0eeda6f1037de2fec9 (diff)
downloadvolse-hubzilla-28943af494eae225b256b9771a5699a1b05d7a2f.tar.gz
volse-hubzilla-28943af494eae225b256b9771a5699a1b05d7a2f.tar.bz2
volse-hubzilla-28943af494eae225b256b9771a5699a1b05d7a2f.zip
Merge pull request #19 from redmatrix/master
updating from original codebase
-rwxr-xr-xboot.php21
-rw-r--r--doc/Features.md4
-rw-r--r--doc/Tags-and-Mentions.md4
-rw-r--r--doc/Widgets.md2
-rw-r--r--doc/addons.bb2
-rw-r--r--doc/cloud.bb2
-rw-r--r--doc/extra_features.bb4
-rw-r--r--doc/features.bb4
-rw-r--r--doc/hidden_configs.bb9
-rw-r--r--doc/roles.md10
-rw-r--r--doc/tags_and_mentions.bb4
-rw-r--r--include/enotify.php8
-rw-r--r--include/features.php4
-rw-r--r--include/group.php10
-rw-r--r--include/identity.php4
-rw-r--r--include/import.php2
-rwxr-xr-xinclude/items.php30
-rw-r--r--include/permissions.php4
-rw-r--r--include/text.php6
-rw-r--r--include/widgets.php32
-rw-r--r--include/zot.php3
-rw-r--r--install/INSTALL.txt8
-rwxr-xr-xinstall/htconfig.sample.php2
-rw-r--r--[-rwxr-xr-x]library/HTMLPurifier/DefinitionCache/Serializer/README0
-rwxr-xr-xlibrary/blueimp_upload/server/node/server.js2
-rw-r--r--[-rwxr-xr-x]library/font_awesome/src/assets/css/prettify.css0
-rw-r--r--[-rwxr-xr-x]library/font_awesome/src/assets/js/ZeroClipboard-1.1.7.swfbin1635 -> 1635 bytes
-rwxr-xr-xlibrary/jqupload/server/node/server.js2
-rw-r--r--[-rwxr-xr-x]library/stylish_select/stylish-select.css0
-rw-r--r--mod/_well_known.php13
-rw-r--r--mod/channel.php2
-rw-r--r--mod/connections.php2
-rw-r--r--mod/directory.php7
-rw-r--r--mod/dirsearch.php2
-rw-r--r--mod/group.php22
-rw-r--r--mod/hostxrd.php1
-rw-r--r--mod/import.php2
-rw-r--r--mod/lostpass.php2
-rw-r--r--mod/magic.php2
-rw-r--r--mod/manage.php2
-rw-r--r--mod/network.php4
-rw-r--r--mod/new_channel.php15
-rw-r--r--mod/photos.php2
-rw-r--r--mod/ping.php2
-rw-r--r--mod/settings.php5
-rw-r--r--mod/thing.php1
-rw-r--r--util/hmessages.po3312
-rwxr-xr-xutil/shredder/JSON.sh1
-rw-r--r--version.inc2
-rw-r--r--view/en/htconfig.tpl2
-rw-r--r--view/es-es/hmessages.po2642
-rw-r--r--view/es-es/hstrings.php531
-rw-r--r--view/nl/hmessages.po2634
-rw-r--r--view/nl/hstrings.php537
-rw-r--r--view/theme/redbasic/css/style.css43
-rw-r--r--view/theme/redbasic/schema/bluegrid.css8
-rw-r--r--view/theme/redbasic/schema/dark.css10
-rw-r--r--view/theme/redbasic/schema/simple_black_on_white.css4
-rw-r--r--view/theme/redbasic/schema/simple_green_on_black.css4
-rw-r--r--view/theme/redbasic/schema/simple_white_on_black.css4
-rwxr-xr-xview/tpl/channel.tpl2
-rwxr-xr-xview/tpl/connection_template.tpl5
-rwxr-xr-xview/tpl/contact_block.tpl6
-rwxr-xr-xview/tpl/email_notify_html.tpl2
-rwxr-xr-xview/tpl/email_notify_text.tpl1
-rwxr-xr-xview/tpl/group_side.tpl2
-rwxr-xr-xview/tpl/new_channel.tpl3
-rwxr-xr-xview/tpl/profile_vcard.tpl13
-rw-r--r--view/tpl/removeaccount.tpl2
-rwxr-xr-xview/tpl/removeme.tpl2
-rwxr-xr-xview/tpl/xchan_vcard.tpl9
71 files changed, 5082 insertions, 4968 deletions
diff --git a/boot.php b/boot.php
index 4db0e56a5..76baba361 100755
--- a/boot.php
+++ b/boot.php
@@ -497,6 +497,11 @@ define ( 'ACTIVITY_POST', NAMESPACE_ACTIVITY_SCHEMA . 'post' );
define ( 'ACTIVITY_UPDATE', NAMESPACE_ACTIVITY_SCHEMA . 'update' );
define ( 'ACTIVITY_TAG', NAMESPACE_ACTIVITY_SCHEMA . 'tag' );
define ( 'ACTIVITY_FAVORITE', NAMESPACE_ACTIVITY_SCHEMA . 'favorite' );
+define ( 'ACTIVITY_CREATE', NAMESPACE_ACTIVITY_SCHEMA . 'create' );
+define ( 'ACTIVITY_WIN', NAMESPACE_ACTIVITY_SCHEMA . 'win' );
+define ( 'ACTIVITY_LOSE', NAMESPACE_ACTIVITY_SCHEMA . 'lose' );
+define ( 'ACTIVITY_TIE', NAMESPACE_ACTIVITY_SCHEMA . 'tie' );
+define ( 'ACTIVITY_COMPLETE', NAMESPACE_ACTIVITY_SCHEMA . 'complete' );
define ( 'ACTIVITY_POKE', NAMESPACE_ZOT . '/activity/poke' );
define ( 'ACTIVITY_MOOD', NAMESPACE_ZOT . '/activity/mood' );
@@ -509,6 +514,7 @@ define ( 'ACTIVITY_OBJ_P_PHOTO', NAMESPACE_ACTIVITY_SCHEMA . 'profile-photo' );
define ( 'ACTIVITY_OBJ_ALBUM', NAMESPACE_ACTIVITY_SCHEMA . 'photo-album' );
define ( 'ACTIVITY_OBJ_EVENT', NAMESPACE_ACTIVITY_SCHEMA . 'event' );
define ( 'ACTIVITY_OBJ_GROUP', NAMESPACE_ACTIVITY_SCHEMA . 'group' );
+define ( 'ACTIVITY_OBJ_GAME', NAMESPACE_ACTIVITY_SCHEMA . 'game' );
define ( 'ACTIVITY_OBJ_TAGTERM', NAMESPACE_ZOT . '/activity/tagterm' );
define ( 'ACTIVITY_OBJ_PROFILE', NAMESPACE_ZOT . '/activity/profile' );
define ( 'ACTIVITY_OBJ_THING', NAMESPACE_ZOT . '/activity/thing' );
@@ -569,6 +575,9 @@ define ( 'ITEM_TYPE_WEBPAGE', 3 );
define ( 'ITEM_TYPE_BUG', 4 );
define ( 'ITEM_TYPE_DOC', 5 );
+define ( 'ITEM_IS_STICKY', 1000 );
+
+
define ( 'DBTYPE_MYSQL', 0 );
define ( 'DBTYPE_POSTGRES', 1 );
@@ -1547,6 +1556,10 @@ function goaway($s) {
* @return int|bool account_id or false
*/
function get_account_id() {
+
+ if(intval($_SESSION['account_id']))
+ return intval($_SESSION['account_id']);
+
if(get_app()->account)
return intval(get_app()->account['account_id']);
@@ -1717,8 +1730,12 @@ function proc_run($cmd){
$cmd = "cmd /c start \"title\" /D \"$cwd\" /b $cmdline";
proc_close(proc_open($cmd, array(), $foo));
}
- else
- proc_close(proc_open($cmdline ." &", array(), $foo));
+ else {
+ if(get_config('system','use_proc_open'))
+ proc_close(proc_open($cmdline ." &", array(), $foo));
+ else
+ exec($cmdline . ' > /dev/null &');
+ }
}
/**
diff --git a/doc/Features.md b/doc/Features.md
index 5a1e8c747..3c5105582 100644
--- a/doc/Features.md
+++ b/doc/Features.md
@@ -57,9 +57,9 @@ Private messages are encrypted during transport and storage. In this day and age
This provides the ability to select posts by date ranges
-**Collections Filter**
+**Privacy Group Filter**
-Enable widget to display stream posts only from selected collections. This also toggles the outbound permissions while you are viewing a collection. This is analogous to Google "circles" or Disapora "aspects".
+Enable widget to display stream posts only from selected groups of connection. This also toggles the outbound permissions while you are viewing a privacy group. This is analogous to Google "circles" or Disapora "aspects".
**Saved Searches**
diff --git a/doc/Tags-and-Mentions.md b/doc/Tags-and-Mentions.md
index 84442dd7a..f01b0ee74 100644
--- a/doc/Tags-and-Mentions.md
+++ b/doc/Tags-and-Mentions.md
@@ -11,9 +11,9 @@ When you start to mention somebody, it will create an auto-complete box to selec
**Private Mentions**
-If you wish to restrict a post to a single person or a number of people, you can do this by selecting channels or collections 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 include them (and perhaps restrict the post from "everybody" if this was the default). You can have more than one privacy tag, for instance @!bob and @!linda will send the post only to Bob and Linda (in addition to any recipients you selected with the privacy selector - if any).
+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 include them (and perhaps restrict the post from "everybody" if this was the default). You can have more than one privacy tag, for instance @!bob and @!linda will send the post only to Bob and Linda (in addition to any recipients you selected with the privacy selector - if any).
-You may also tag public collections. When you create or edit a collection, there is a checkbox to allow the group members to be seen by others. If this box is checked for a collection and you tag (for instance) @!Friends - the post will be restricted to the Friends collection. Check that the collection is public before doing this - as there is no way to take back a post except to delete it. The collection name will appear in the post and will alert members of that collection that they are members of it.
+You may also tag privacy groups which are "public". When you create or edit a privacy group, there is a checkbox to allow the group members to be seen by others. If this box is checked for a group and you tag (for instance) @!Friends - the post will be restricted to the Friends group. Check that the group is public before doing this - as there is no way to take back a post except to delete it. The group name will appear in the post and will alert members of that group that they are members of it.
diff --git a/doc/Widgets.md b/doc/Widgets.md
index 06f043356..10fc75cf8 100644
--- a/doc/Widgets.md
+++ b/doc/Widgets.md
@@ -15,7 +15,7 @@ Some/many of these widgets have restrictions which may restrict the type of page
* args: count - number of items to return (default 24)
<br />&nbsp;<br />
-* collections - collection selector for the current logged in channel
+* collections - privacy group selector for the current logged in channel
* args: mode - one of "conversation", "group", "abook" depending on module
<br />&nbsp;<br />
diff --git a/doc/addons.bb b/doc/addons.bb
index 6152089f9..67282521f 100644
--- a/doc/addons.bb
+++ b/doc/addons.bb
@@ -15,7 +15,6 @@
[*] dirstats - show some interesting statistics generated by the driectory server
[*] donate - provides a project donation page
[*] dwpost - crosspost to Dreamwidth
-[*] embedly - use the embedly (formerly ooehmbed) service to embed media from many providers
[*] extcron - use an external cron service to run your hub's scheduled tasks
[*] flattrwidget - provides a "Flattr Us" button
[*] flip - create upside down text
@@ -38,6 +37,7 @@
[*] moremoods - Additional mood options
[*] morepokes - additional poke options (not safe for work)
[*] msgfooter - provide legal or other text on each outgoing post
+[*] noembed - use noembed.com as an addition to Hubzilla's native oembed functionality (currently broken)
[*] nofed - prevent "federation" of channel posts, maintains all interaction on your site
[*] nsabait - add random terrorism related hashtags to your posts
[*] nsfw - Highly recommended plugin to collpase posts with inappropriate content
diff --git a/doc/cloud.bb b/doc/cloud.bb
index 20498e6a5..d5195c0f5 100644
--- a/doc/cloud.bb
+++ b/doc/cloud.bb
@@ -22,6 +22,6 @@ See: [zrl=[baseurl]/help/cloud_desktop_clients]Cloud Desktop Clients[/zrl]
[b]Permissions[/b]
-When using WebDAV, the file is created with your channel's default file permissions and this cannot be changed from within the operating system. It also may not be as restrictive as you would like. What we've found is that the preferred method of making files private is to first create folders or directories; then visit &quot;filestorage/{{username}}&quot;; select the directory and change the permissions. Do this before you put anything into the directory. The directory permissions take precedence so you can then put files or other folders into that container and they will be protected from unwanted viewers by the directory permissions. It is common for folks to create a &quot;personal&quot; or &quot;private&quot; folder which is restricted to themselves. You can use this as a personal cloud to store anything from anywhere on the web or any computer and it is protected from others. You might also create folders for &quot;family&quot; and &quot;friends&quot; with permission granted to appropriate collections of channels.
+When using WebDAV, the file is created with your channel's default file permissions and this cannot be changed from within the operating system. It also may not be as restrictive as you would like. What we've found is that the preferred method of making files private is to first create folders or directories; then visit &quot;filestorage/{{username}}&quot;; select the directory and change the permissions. Do this before you put anything into the directory. The directory permissions take precedence so you can then put files or other folders into that container and they will be protected from unwanted viewers by the directory permissions. It is common for folks to create a &quot;personal&quot; or &quot;private&quot; folder which is restricted to themselves. You can use this as a personal cloud to store anything from anywhere on the web or any computer and it is protected from others. You might also create folders for &quot;family&quot; and &quot;friends&quot; with permission granted to appropriate privacy groups.
#include doc/macros/main_footer.bb;
diff --git a/doc/extra_features.bb b/doc/extra_features.bb
index ed513eeb3..9fb43d9a1 100644
--- a/doc/extra_features.bb
+++ b/doc/extra_features.bb
@@ -47,9 +47,9 @@ Private messages are encrypted during transport and storage. In this day and age
This provides the ability to select posts by date ranges
-[b]Collections Filter[/b]
+[b]Privacy Group Filter[/b]
-Enable widget to display stream posts only from selected collections. This also toggles the outbound permissions while you are viewing a collection. This is analogous to Google &quot;circles&quot; or Disapora &quot;aspects&quot;.
+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 &quot;circles&quot; or Disapora &quot;aspects&quot;.
[b]Saved Searches[/b]
diff --git a/doc/features.bb b/doc/features.bb
index 2d9849d4e..3daf403c3 100644
--- a/doc/features.bb
+++ b/doc/features.bb
@@ -106,9 +106,9 @@ There is also experimental support for OpenID authentication which may be used i
Channels may have permissions to become "derivative channels" where two or more existing channels combine to create a new topical channel.
-[b]Collections[/b]
+[b]Privacy Groups[/b]
-"Collections" is our implementation of privacy groups, which is similar to Google "Circles" and Diaspora "Aspects". This allows you to filter your incoming stream by collections or groups, and automatically set the outbound Access Control List to only those in the Collection when you post. You may over-ride this at any time (prior to sending the post).
+Our implementation of privacy groups is similar to Google "Circles" and Diaspora "Aspects". This allows you to filter your incoming stream by selected groups, and automatically set the outbound Access Control List to only those in that privacy group when you post. You may over-ride this at any time (prior to sending the post).
[b]Directory Services[/b]
diff --git a/doc/hidden_configs.bb b/doc/hidden_configs.bb
index c07d6ca01..0f6c0f635 100644
--- a/doc/hidden_configs.bb
+++ b/doc/hidden_configs.bb
@@ -59,7 +59,11 @@ This document assumes you're an administrator.
[b]system.taganyone[/b]
Allow the @mention tagging of anyone whether you are connected or not.
[b]system.directorytags[/b]
- Set the number of keyword tags displayed on the directory page.
+ Set the number of keyword tags displayed on the directory page. Default is 50 unless set to a
+ positive integer.
+ [b]system.disable_directory_keywords[/b]
+ If '1', do not show directory keywords. If the hub is a directory server, prevent returning
+ tags to any directory clients. Please do not set this for directory servers in the RED_GLOBAL realm.
[b]system.disable_dreport[/b]
If '1', don't store or link to delivery reports
[b]system.startpage[/b]
@@ -90,6 +94,9 @@ This document assumes you're an administrator.
Similar to block_public, except only blocks public access to
search features. Useful for sites that want to be public, but
keep getting hammered by search engines.
+ [b]system.proc_run_use_exec
+ If 1, use the exec system call in proc_run to run background tasks. By default
+ we use proc_open and proc_close. On some (currently rare) systems this does not work well.
[b]system.paranoia[/b]
As the pconfig, but on a site-wide basis. Can be overwritten
by member settings.
diff --git a/doc/roles.md b/doc/roles.md
index 5d8d07113..a7608ff90 100644
--- a/doc/roles.md
+++ b/doc/roles.md
@@ -11,11 +11,11 @@ The channel is a typical social networking profile. By default posts and publish
**Restricted**
-By default all posts and published items are sent to your 'Friends' collection and not made public. New friends are added to this collection. You can over-ride this and create a public post or published item if you desire. You are listed in the directory. Your online presence (for chat) and your connections (friends) are visible to your profile viewers.
+By default all posts and published items are sent to your 'Friends' privacy group and not made public. New friends are added to this privacy group. You can over-ride this and create a public post or published item if you desire. You are listed in the directory. Your online presence (for chat) and your connections (friends) are visible to your profile viewers.
**Private**
-By default all posts and published items are sent to your 'Friends' collection. New friends are added to this collection. You can over-ride this and create a public post or public item if you desire. You are NOT listed in the directory. Only your connections can see your other connections. Your online presence is hidden.
+By default all posts and published items are sent to your 'Friends' privacy group. New friends are added to this privacy group. You can over-ride this and create a public post or public item if you desire. You are NOT listed in the directory. Only your connections can see your other connections. Your online presence is hidden.
##Forum
@@ -27,11 +27,11 @@ The channel is a typical forum. By default posts and published items are public.
**Restricted**
-By default all posts and published items are sent to the channel's 'Friends' collection. New friends are added to this collection. Members may post by @mention+ or wall-to-wall post, but posts and replies may also be seen by other receipients of the top-level post who are not members. The channel is visible in the directory. Members must be manually added by the forum owner.
+By default all posts and published items are sent to the channel's 'Friends' privacy group. New friends are added to this privacy group. Members may post by @mention+ or wall-to-wall post, but posts and replies may also be seen by other receipients of the top-level post who are not members. The channel is visible in the directory. Members must be manually added by the forum owner.
**Private**
-By default all posts and published items are sent to your 'Friends' collection. New friends are added to this collection. The owner can over-ride this and create a public post or public item if desired. Members cannot. You are NOT listed in the directory. Only your connections can see your other connections. Your online presence is hidden. Members must be manually added by the forum owner. Posting by @mention+ is disabled. Posts can only be made via wall-to-wall posts, and sent to members of the 'Friends' collection. They are not publicly visible.
+By default all posts and published items are sent to your 'Friends' privacy group. New friends are added to this privacy group. The owner can over-ride this and create a public post or public item if desired. Members cannot. You are NOT listed in the directory. Only your connections can see your other connections. Your online presence is hidden. Members must be manually added by the forum owner. Posting by @mention+ is disabled. Posts can only be made via wall-to-wall posts, and sent to members of the 'Friends' privacy group. They are not publicly visible.
##Feed
@@ -44,7 +44,7 @@ Similiar to Social - Mostly Public, but tailored for RSS feed sources. Items may
**Restricted**
-Not listed in directory. Online presence is meaningless, therefore hidden. Feed is published only to members of the 'Friends' collection. New connections are automatically added to this collections. Members must be manually approved by the channel owner.
+Not listed in directory. Online presence is meaningless, therefore hidden. Feed is published only to members of the 'Friends' privacy group. New connections are automatically added to this privacy group. Members must be manually approved by the channel owner.
##Special
diff --git a/doc/tags_and_mentions.bb b/doc/tags_and_mentions.bb
index d638492bb..29dfe0fbe 100644
--- a/doc/tags_and_mentions.bb
+++ b/doc/tags_and_mentions.bb
@@ -31,9 +31,9 @@ Some connections in the mention auto-complete box behave differently than others
[b]Private Mentions[/b]
-If you wish to restrict a post to a single person or a number of people, you can do this by selecting channels or collections 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.
+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.
-You may also tag public collections. When you create or edit a collection, there is a checkbox to allow the group members to be seen by others. If this box is checked for a collection and you tag (for instance) @!Friends - the post will be restricted to the Friends collection. Check that the collection is public before doing this - as there is no way to take back a post except to delete it. The collection name will appear in the post and will alert members of that collection that they are members of it.
+You may also tag privacy groups which are "public". When you create or edit a privacy group, there is a checkbox to allow the group members to be seen by others. If this box is checked for a group and you tag (for instance) @!Friends - the post will be restricted to the Friends group. Check that the group is public before doing this - as there is no way to take back a post except to delete it. The group name will appear in the post and will alert members of that group that they are members of it.
[b]Mentions and Comments[/b]
diff --git a/include/enotify.php b/include/enotify.php
index 5bb53aa0e..c4c49c8ff 100644
--- a/include/enotify.php
+++ b/include/enotify.php
@@ -273,14 +273,14 @@ function notification($params) {
$preamble = sprintf( t('%1$s, you\'ve received an new connection request from \'%2$s\' at %3$s'), $recip['channel_name'], $sender['xchan_name'], $sitename);
$epreamble = sprintf( t('%1$s, you\'ve received [zrl=%2$s]a new connection request[/zrl] from %3$s.'),
$recip['channel_name'],
- $itemlink,
+ $siteurl . '/connections/ifpending',
'[zrl=' . $sender['xchan_url'] . ']' . $sender['xchan_name'] . '[/zrl]');
$body = sprintf( t('You may visit their profile at %s'),$sender['xchan_url']);
$sitelink = t('Please visit %s to approve or reject the connection request.');
- $tsitelink = sprintf( $sitelink, $siteurl );
- $hsitelink = sprintf( $sitelink, '<a href="' . $siteurl . '">' . $sitename . '</a>');
- $itemlink = $params['link'];
+ $tsitelink = sprintf( $sitelink, $siteurl . '/connections/ifpending');
+ $hsitelink = sprintf( $sitelink, '<a href="' . $siteurl . '/connections/ifpending">' . $sitename . '</a>');
+ $itemlink = $params['link'];
}
if ($params['type'] == NOTIFY_SUGGEST) {
diff --git a/include/features.php b/include/features.php
index b18a58ed4..4d8d162fa 100644
--- a/include/features.php
+++ b/include/features.php
@@ -50,7 +50,7 @@ function get_features($filtered = true) {
array('profile_export', t('Profile Import/Export'), t('Save and load profile details across sites/channels'),false,get_config('feature_lock','profile_export')),
array('webpages', t('Web Pages'), t('Provide managed web pages on your channel'),false,get_config('feature_lock','webpages')),
array('hide_rating', t('Hide Rating'), t('Hide the rating buttons on your channel and profile pages. Note: People can still rate you somewhere else.'),false,get_config('feature_lock','hide_rating')),
- array('private_notes', t('Private Notes'), t('Enables a tool to store notes and reminders'),false,get_config('feature_lock','private_notes')),
+ array('private_notes', t('Private Notes'), t('Enables a tool to store notes and reminders (note: not encrypted)'),false,get_config('feature_lock','private_notes')),
array('nav_channel_select', t('Navigation Channel Select'), t('Change channels directly from within the navigation dropdown menu'),false,get_config('feature_lock','nav_channel_select')),
array('photo_location', t('Photo Location'), t('If location data is available on uploaded photos, link this to a map.'),false,get_config('feature_lock','photo_location')),
@@ -76,7 +76,7 @@ function get_features($filtered = true) {
'net_module' => array(
t('Network and Stream Filtering'),
array('archives', t('Search by Date'), t('Ability to select posts by date ranges'),false,get_config('feature_lock','archives')),
- array('groups', t('Collections (Privacy Groups)'), t('Enable widget to display Network posts only from selected collections'),false,get_config('feature_lock','groups')),
+ array('groups', t('Privacy Groups'), t('Enable management and selection of privacy groups'),true,get_config('feature_lock','groups')),
array('savedsearch', t('Saved Searches'), t('Save search terms for re-use'),false,get_config('feature_lock','savedsearch')),
array('personal_tab', t('Network Personal Tab'), t('Enable tab to display only Network posts that you\'ve interacted on'),false,get_config('feature_lock','personal_tab')),
array('new_tab', t('Network New Tab'), t('Enable tab to display all new Network activity'),false,get_config('feature_lock','new_tab')),
diff --git a/include/group.php b/include/group.php
index 0875b10f9..bef008afd 100644
--- a/include/group.php
+++ b/include/group.php
@@ -229,7 +229,7 @@ function mini_group_select($uid,$group = '') {
logger('mini_group_select: ' . print_r($grps,true), LOGGER_DATA);
$o = replace_macros(get_markup_template('group_selection.tpl'), array(
- '$label' => t('Add new connections to this collection (privacy group)'),
+ '$label' => t('Add new connections to this privacy group'),
'$groups' => $grps
));
return $o;
@@ -292,10 +292,10 @@ function group_side($every="connections",$each="group",$edit = false, $group_id
$tpl = get_markup_template("group_side.tpl");
$o = replace_macros($tpl, array(
- '$title' => t('Collections'),
- '$edittext' => t('Edit collection'),
- '$createtext' => t('Add new collection'),
- '$ungrouped' => (($every === 'contacts') ? t('Channels not in any collection') : ''),
+ '$title' => t('Privacy Groups'),
+ '$edittext' => t('Edit group'),
+ '$createtext' => t('Add privacy group'),
+ '$ungrouped' => (($every === 'contacts') ? t('Channels not in any privacy group') : ''),
'$groups' => $groups,
'$add' => t('add'),
));
diff --git a/include/identity.php b/include/identity.php
index 32c4dd130..fd0b4d7f5 100644
--- a/include/identity.php
+++ b/include/identity.php
@@ -924,6 +924,9 @@ function profile_sidebar($profile, $block = 0, $show_connect = true) {
$pdesc = true;
$reddress = true;
+ if($block && intval(get_config('system','block_public_blackout')))
+ return $o;
+
if((! is_array($profile)) && (! count($profile)))
return $o;
@@ -935,6 +938,7 @@ function profile_sidebar($profile, $block = 0, $show_connect = true) {
$show_connect = false;
+
$profile['picdate'] = urlencode($profile['picdate']);
call_hooks('profile_sidebar_enter', $profile);
diff --git a/include/import.php b/include/import.php
index e208c3b00..b7ec1c565 100644
--- a/include/import.php
+++ b/include/import.php
@@ -2,7 +2,7 @@
require_once('include/menu.php');
-function import_channel($channel, $account_id) {
+function import_channel($channel, $account_id, $seize) {
if(! array_key_exists('channel_system',$channel)) {
$channel['channel_system'] = (($channel['channel_pageflags'] & 0x1000) ? 1 : 0);
diff --git a/include/items.php b/include/items.php
index 6acf1c883..b38049e70 100755
--- a/include/items.php
+++ b/include/items.php
@@ -159,7 +159,7 @@ function filter_insecure($channel_id, $arr) {
$ret = array();
- if((! intval(get_pconfig($channel_id, 'system', 'filter_insecure_collections'))) || (! $arr))
+ if((! intval(get_pconfig($channel_id, 'system', 'filter_insecure_privacy_groups'))) || (! $arr))
return $arr;
$str = '';
@@ -3687,6 +3687,16 @@ function consume_feed($xml, $importer, &$contact, $pass = 0) {
return;
}
+ $sys_expire = intval(get_config('system','default_expire_days'));
+ $chn_expire = intval($importer['channel_expire_days']);
+
+ $expire_days = $sys_expire;
+
+ if(($chn_expire != 0) && ($chn_expire < $sys_expire))
+ $expire_days = $chn_expire;
+
+logger('expire_days: ' . $expire_days);
+
$feed = new SimplePie();
$feed->set_raw_data($xml);
$feed->init();
@@ -3790,6 +3800,7 @@ function consume_feed($xml, $importer, &$contact, $pass = 0) {
intval($importer['channel_id'])
);
+
// Update content if 'updated' changes
if($r) {
@@ -3848,6 +3859,17 @@ function consume_feed($xml, $importer, &$contact, $pass = 0) {
$datarray['owner_xchan'] = $contact['xchan_hash'];
+ if(array_key_exists('created',$datarray) && $datarray['created'] != NULL_DATE && $expire_days) {
+ $t1 = $datarray['created'];
+ $t2 = datetime_convert('UTC','UTC','now - ' . $expire_days . 'days');
+ if($t1 < $t2) {
+ logger('feed content older than expiration. Ignoring.', LOGGER_DEBUG, LOG_INFO);
+ continue;
+ }
+ }
+
+
+
$r = q("SELECT edited FROM item WHERE mid = '%s' AND uid = %d LIMIT 1",
dbesc($item_id),
intval($importer['channel_id'])
@@ -4837,7 +4859,7 @@ function items_fetch($arr,$channel = null,$observer_hash = null,$client_mode = C
intval($uid)
);
if(! $r) {
- $result['message'] = t('Collection not found.');
+ $result['message'] = t('Privacy group not found.');
return $result;
}
@@ -4853,14 +4875,14 @@ function items_fetch($arr,$channel = null,$observer_hash = null,$client_mode = C
}
} else {
$contact_str = ' 0 ';
- $result['message'] = t('Collection is empty.');
+ $result['message'] = t('Privacy group is empty.');
return $result;
}
$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($r[0]['hash']) . '>%') . "' ) and id = parent $item_normal ) ";
$x = group_rec_byhash($uid,$r[0]['hash']);
- $result['headline'] = sprintf( t('Collection: %s'),$x['name']);
+ $result['headline'] = sprintf( t('Privacy group: %s'),$x['name']);
}
elseif($arr['cid'] && $uid) {
diff --git a/include/permissions.php b/include/permissions.php
index a8e761f87..8071af686 100644
--- a/include/permissions.php
+++ b/include/permissions.php
@@ -641,10 +641,10 @@ function get_role_perms($role) {
$ret['directory_publish'] = true;
$ret['online'] = false;
$ret['perms_follow'] = PERMS_R_STREAM|PERMS_R_PROFILE|PERMS_R_ABOOK
- |PERMS_W_STREAM|PERMS_W_WALL|PERMS_W_COMMENT|PERMS_W_MAIL|PERMS_W_CHAT
+ |PERMS_W_WALL|PERMS_W_COMMENT|PERMS_W_MAIL|PERMS_W_CHAT
|PERMS_R_STORAGE|PERMS_R_PAGES|PERMS_A_REPUBLISH|PERMS_W_LIKE|PERMS_W_TAGWALL;
$ret['perms_accept'] = PERMS_R_STREAM|PERMS_R_PROFILE|PERMS_R_ABOOK
- |PERMS_W_STREAM|PERMS_W_WALL|PERMS_W_COMMENT|PERMS_W_MAIL|PERMS_W_CHAT
+ |PERMS_W_WALL|PERMS_W_COMMENT|PERMS_W_MAIL|PERMS_W_CHAT
|PERMS_R_STORAGE|PERMS_R_PAGES|PERMS_A_REPUBLISH|PERMS_W_LIKE|PERMS_W_TAGWALL;
$ret['channel_r_stream'] = PERMS_PUBLIC;
$ret['channel_r_profile'] = PERMS_PUBLIC;
diff --git a/include/text.php b/include/text.php
index 6f7297bb0..0b5ad9c72 100644
--- a/include/text.php
+++ b/include/text.php
@@ -812,7 +812,7 @@ function contact_block() {
);
if(count($r)) {
- $contacts = sprintf( tt('%d Connection','%d Connections', $total),$total);
+ $contacts = t('Connections');
$micropro = Array();
foreach($r as $rr) {
$rr['archived'] = (intval($rr['abook_archived']) ? true : false);
@@ -825,7 +825,7 @@ function contact_block() {
$o = replace_macros($tpl, array(
'$contacts' => $contacts,
'$nickname' => $a->profile['channel_address'],
- '$viewconnections' => t('View Connections'),
+ '$viewconnections' => (($total > $shown) ? sprintf(t('View all %s connections'),$total) : ''),
'$micropro' => $micropro,
));
@@ -2716,5 +2716,7 @@ function item_url_replace($channel,&$item,$old,$new) {
$item['sig'] = base64url_encode(rsa_sign($item['body'],$channel['channel_prvkey']));
$item['item_verified'] = 1;
}
+
+ // @fixme item['plink'] and item['llink']
}
diff --git a/include/widgets.php b/include/widgets.php
index 60605cb51..891e9c018 100644
--- a/include/widgets.php
+++ b/include/widgets.php
@@ -807,20 +807,28 @@ function widget_suggestedchats($arr) {
}
function widget_item($arr) {
- // FIXME there is no $a here
- $uid = $a->profile['profile_uid'];
- if((! $uid) || (! $arr['mid']))
+
+ $channel_id = 0;
+ if(array_key_exists('channel_id',$arr) && intval($arr['channel_id']))
+ $channel_id = intval($arr['channel_id']);
+ if(! $channel_id)
+ $channel_id = get_app()->profile_uid;
+ if(! $channel_id)
return '';
- if(! perm_is_allowed($uid, get_observer_hash(), 'view_pages'))
+
+ if(! $arr['mid'])
+ return '';
+
+ if(! perm_is_allowed($channel_id, get_observer_hash(), 'view_pages'))
return '';
require_once('include/security.php');
- $sql_extra = item_permissions_sql($uid);
+ $sql_extra = item_permissions_sql($channel_id);
$r = q("select * from item where mid = '%s' and uid = %d and item_type = " . intval(ITEM_TYPE_WEBPAGE) . " $sql_extra limit 1",
dbesc($arr['mid']),
- intval($uid)
+ intval($channel_id)
);
if(! $r)
@@ -1110,16 +1118,18 @@ function widget_rating($arr) {
}
+
+ $o = '<div class="widget">';
+ $o .= '<h3>' . t('Rating Tools') . '</h3>';
+
if((($remote) || (local_channel())) && (! $self)) {
- $o = '<div class="widget rateme">';
if($remote)
- $o .= '<a class="rateme" href="' . $url . '"><i class="icon-pencil"></i> ' . t('Rate Me') . '</a>';
+ $o .= '<a class="btn btn-block btn-primary btn-sm" href="' . $url . '"><i class="icon-pencil"></i> ' . t('Rate Me') . '</a>';
else
- $o .= '<div class="rateme fakelink" onclick="doRatings(\'' . $hash . '\'); return false;"><i class="icon-pencil"></i> ' . t('Rate Me') . '</div>';
- $o .= '</div>';
+ $o .= '<div class="btn btn-block btn-primary btn-sm" onclick="doRatings(\'' . $hash . '\'); return false;"><i class="icon-pencil"></i> ' . t('Rate Me') . '</div>';
}
- $o .= '<div class="widget rateme"><a class="rateme" href="ratings/' . $hash . '"><i class="icon-eye-open"></i> ' . t('View Ratings') . '</a>';
+ $o .= '<a class="btn btn-block btn-default btn-sm" href="ratings/' . $hash . '"><i class="icon-eye-open"></i> ' . t('View Ratings') . '</a>';
$o .= '</div>';
return $o;
diff --git a/include/zot.php b/include/zot.php
index 9d09aaf58..0210f3f4a 100644
--- a/include/zot.php
+++ b/include/zot.php
@@ -3186,8 +3186,9 @@ function process_channel_sync_delivery($sender, $arr, $deliveries) {
logger('process_channel_sync_delivery: total_feeds service class limit exceeded');
continue;
}
- q("insert into abook ( abook_xchan, abook_channel ) values ('%s', %d ) ",
+ q("insert into abook ( abook_xchan, abook_account, abook_channel ) values ('%s', %d, %d ) ",
dbesc($clean['abook_xchan']),
+ intval($channel['channel_account_id']),
intval($channel['channel_id'])
);
$total_friends ++;
diff --git a/install/INSTALL.txt b/install/INSTALL.txt
index 78cea638d..22c7ef35f 100644
--- a/install/INSTALL.txt
+++ b/install/INSTALL.txt
@@ -62,6 +62,14 @@ When communicating with new sites, Hubzilla always attempts connection on the
SSL port first, before falling back to a less secure connection. If you do not
use SSL, your webserver MUST NOT listen on port 443 at all.
+If you use LetsEncrypt to provide certificates and create a file under
+.well-known/acme-challenge so that LetsEncrypt can verify your domain ownership,
+please remove or rename the .well-known directory as soon as the certificate is
+generated. Hubzilla will provide its own handler for ".well-known" services when
+it is installed, and an existing directory in this location may prevent some of
+these services from working correctly.
+
+
1. Requirements
- Apache with mod-rewrite enabled and "AllowOverride All" so you can use a
local .htaccess file. Some folks have successfully used nginx and lighttpd.
diff --git a/install/htconfig.sample.php b/install/htconfig.sample.php
index 794afa93b..df39bc9ad 100755
--- a/install/htconfig.sample.php
+++ b/install/htconfig.sample.php
@@ -37,7 +37,7 @@ $db_type = 0; // use 1 for postgres, 0 for mysql
$default_timezone = 'America/Los_Angeles';
-// What is your site name?
+// What is your site name? DO NOT ADD A TRAILING SLASH!
$a->config['system']['baseurl'] = 'https://myredsite.example';
$a->config['system']['sitename'] = "Hubzilla";
diff --git a/library/HTMLPurifier/DefinitionCache/Serializer/README b/library/HTMLPurifier/DefinitionCache/Serializer/README
index 2e35c1c3d..2e35c1c3d 100755..100644
--- a/library/HTMLPurifier/DefinitionCache/Serializer/README
+++ b/library/HTMLPurifier/DefinitionCache/Serializer/README
diff --git a/library/blueimp_upload/server/node/server.js b/library/blueimp_upload/server/node/server.js
index 7bab20f59..808d6ffe1 100755
--- a/library/blueimp_upload/server/node/server.js
+++ b/library/blueimp_upload/server/node/server.js
@@ -1,4 +1,4 @@
-#!/usr/bin/env node
+#!/usr/bin/nodejs
/*
* jQuery File Upload Plugin Node.js Example 2.1.2
* https://github.com/blueimp/jQuery-File-Upload
diff --git a/library/font_awesome/src/assets/css/prettify.css b/library/font_awesome/src/assets/css/prettify.css
index aedd8d1a9..aedd8d1a9 100755..100644
--- a/library/font_awesome/src/assets/css/prettify.css
+++ b/library/font_awesome/src/assets/css/prettify.css
diff --git a/library/font_awesome/src/assets/js/ZeroClipboard-1.1.7.swf b/library/font_awesome/src/assets/js/ZeroClipboard-1.1.7.swf
index 880e64ee7..880e64ee7 100755..100644
--- a/library/font_awesome/src/assets/js/ZeroClipboard-1.1.7.swf
+++ b/library/font_awesome/src/assets/js/ZeroClipboard-1.1.7.swf
Binary files differ
diff --git a/library/jqupload/server/node/server.js b/library/jqupload/server/node/server.js
index 5eb07a6ed..e489772b5 100755
--- a/library/jqupload/server/node/server.js
+++ b/library/jqupload/server/node/server.js
@@ -1,4 +1,4 @@
-#!/usr/bin/env node
+#!/usr/bin/nodejs
/*
* jQuery File Upload Plugin Node.js Example 2.1.1
* https://github.com/blueimp/jQuery-File-Upload
diff --git a/library/stylish_select/stylish-select.css b/library/stylish_select/stylish-select.css
index 1f3dcd28d..1f3dcd28d 100755..100644
--- a/library/stylish_select/stylish-select.css
+++ b/library/stylish_select/stylish-select.css
diff --git a/mod/_well_known.php b/mod/_well_known.php
index d88bc2391..58ed13ece 100644
--- a/mod/_well_known.php
+++ b/mod/_well_known.php
@@ -33,6 +33,19 @@ function _well_known_init(&$a){
break;
default:
+ // look in $WEBROOT/well_known for the requested file in case it is
+ // something a site requires and for which we do not have a module
+
+ // @fixme - we may need to determine the content-type and stick it in the header
+ // for now this can be done with a php script masquerading as the requested file
+
+ $wk_file = str_replace('.well-known','well_known',$a->cmd);
+ if(file_exists($wk_file)) {
+ echo file_get_contents($wk_file);
+ killme();
+ }
+ elseif(file_exists($wk_file . '.php'))
+ require_once($wk_file . '.php');
break;
}
diff --git a/mod/channel.php b/mod/channel.php
index 074017466..3b80e2cb8 100644
--- a/mod/channel.php
+++ b/mod/channel.php
@@ -163,6 +163,7 @@ function channel_content(&$a, $update = 0, $load = false) {
$simple_update = '';
if(($update) && (! $load)) {
+
if ($mid) {
$r = q("SELECT parent AS item_id from item where mid like '%s' and uid = %d $item_normal
AND item_wall = 1 AND item_unseen = 1 $sql_extra limit 1",
@@ -258,7 +259,6 @@ function channel_content(&$a, $update = 0, $load = false) {
$items = array();
}
-
if((! $update) && (! $load)) {
// This is ugly, but we can't pass the profile_uid through the session to the ajax updater,
diff --git a/mod/connections.php b/mod/connections.php
index f43dec73e..1de8279c4 100644
--- a/mod/connections.php
+++ b/mod/connections.php
@@ -269,6 +269,8 @@ function connections_content(&$a) {
'connected' => datetime_convert('UTC',date_default_timezone_get(),$rr['abook_created'], 'c'),
'approve_hover' => t('Approve connection'),
'approve' => (($rr['abook_pending']) ? t('Approve') : false),
+ 'ignore_hover' => t('Ignore connection'),
+ 'ignore' => ((! $rr['abook_ignored']) ? t('Ignore') : false),
'recent_label' => t('Recent activity'),
'recentlink' => z_root() . '/network/?f=&cid=' . intval($rr['abook_id'])
);
diff --git a/mod/directory.php b/mod/directory.php
index 4ab118b17..dca96694e 100644
--- a/mod/directory.php
+++ b/mod/directory.php
@@ -144,11 +144,14 @@ function directory_content(&$a) {
}
if($url) {
- // We might want to make the tagadelic count (&kw=) configurable or turn it off completely.
$numtags = get_config('system','directorytags');
- $kw = ((intval($numtags)) ? $numtags : 50);
+ $kw = ((intval($numtags) > 0) ? intval($numtags) : 50);
+
+ if(get_config('system','disable_directory_keywords'))
+ $kw = 0;
+
$query = $url . '?f=&kw=' . $kw . (($safe_mode != 1) ? '&safe=' . $safe_mode : '');
if($token)
diff --git a/mod/dirsearch.php b/mod/dirsearch.php
index 388e5f3ac..bc2fa108f 100644
--- a/mod/dirsearch.php
+++ b/mod/dirsearch.php
@@ -75,6 +75,8 @@ function dirsearch_content(&$a) {
$kw = ((x($_REQUEST,'kw')) ? intval($_REQUEST['kw']) : 0 );
$forums = ((array_key_exists('pubforums',$_REQUEST)) ? intval($_REQUEST['pubforums']) : 0);
+ if(get_config('system','disable_directory_keywords'))
+ $kw = 0;
// by default use a safe search
diff --git a/mod/group.php b/mod/group.php
index ce9633669..7eaad771f 100644
--- a/mod/group.php
+++ b/mod/group.php
@@ -17,13 +17,13 @@ function group_post(&$a) {
$public = intval($_POST['public']);
$r = group_add(local_channel(),$name,$public);
if($r) {
- info( t('Collection created.') . EOL );
+ info( t('Privacy group created.') . EOL );
$r = group_byname(local_channel(),$name);
if($r)
goaway($a->get_baseurl() . '/group/' . $r);
}
else
- notice( t('Could not create collection.') . EOL );
+ notice( t('Could not create privacy group.') . EOL );
goaway($a->get_baseurl() . '/group');
}
@@ -35,7 +35,7 @@ function group_post(&$a) {
intval(local_channel())
);
if(! $r) {
- notice( t('Collection not found.') . EOL );
+ notice( t('Privacy group not found.') . EOL );
goaway($a->get_baseurl() . '/connections');
}
@@ -51,7 +51,7 @@ function group_post(&$a) {
intval($group['id'])
);
if($r)
- info( t('Collection updated.') . EOL );
+ info( t('Privacy group updated.') . EOL );
}
goaway(z_root() . '/group/' . argv(1) . '/' . argv(2));
@@ -83,8 +83,8 @@ function group_content(&$a) {
if((argc() == 2) && (argv(1) === 'new')) {
return replace_macros($tpl, $context + array(
- '$title' => t('Create a collection of channels.'),
- '$gname' => array('groupname',t('Collection Name: '), '', ''),
+ '$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, ''),
'$form_security_token' => get_form_security_token("group_edit"),
@@ -104,9 +104,9 @@ function group_content(&$a) {
if($r)
$result = group_rmv(local_channel(),$r[0]['name']);
if($result)
- info( t('Collection removed.') . EOL);
+ info( t('Privacy group removed.') . EOL);
else
- notice( t('Unable to remove collection.') . EOL);
+ notice( t('Unable to remove privacy group.') . EOL);
}
goaway($a->get_baseurl() . '/group');
// NOTREACHED
@@ -134,7 +134,7 @@ function group_content(&$a) {
intval(local_channel())
);
if(! $r) {
- notice( t('Collection not found.') . EOL );
+ notice( t('Privacy group not found.') . EOL );
goaway($a->get_baseurl() . '/connections');
}
$group = $r[0];
@@ -176,8 +176,8 @@ function group_content(&$a) {
$context = $context + array(
- '$title' => t('Collection Editor'),
- '$gname' => array('groupname',t('Collection Name: '),$group['name'], ''),
+ '$title' => t('Privacy group editor'),
+ '$gname' => array('groupname',t('Privacy group name: '),$group['name'], ''),
'$gid' => $group['id'],
'$drop' => $drop_txt,
'$public' => array('public',t('Members are visible to other channels'), $group['visible'], ''),
diff --git a/mod/hostxrd.php b/mod/hostxrd.php
index 0e18c133b..18066b7bf 100644
--- a/mod/hostxrd.php
+++ b/mod/hostxrd.php
@@ -12,6 +12,7 @@ function hostxrd_init(&$a) {
));
$arr = array('xrd' => $x);
call_hooks('hostxrd',$arr);
+
echo $arr['xrd'];
killme();
}
diff --git a/mod/import.php b/mod/import.php
index 02e71233a..b6091d944 100644
--- a/mod/import.php
+++ b/mod/import.php
@@ -123,7 +123,7 @@ function import_account(&$a, $account_id) {
if(array_key_exists('channel',$data)) {
if($completed < 1) {
- $channel = import_channel($data['channel'], $account_id);
+ $channel = import_channel($data['channel'], $account_id, $seize);
}
else {
diff --git a/mod/lostpass.php b/mod/lostpass.php
index 3dbc2fe7d..ffdd7b62e 100644
--- a/mod/lostpass.php
+++ b/mod/lostpass.php
@@ -87,7 +87,7 @@ function lostpass_content(&$a) {
'$lbl2' => t('Your password has been reset as requested.'),
'$lbl3' => t('Your new password is'),
'$lbl4' => t('Save or copy your new password - and then'),
- '$lbl5' => '<a href="' . $a->get_baseurl() . '">' . t('click here to login') . '</a>.',
+ '$lbl5' => '<a href="' . $a->get_baseurl() . '/login">' . t('click here to login') . '</a>.',
'$lbl6' => t('Your password may be changed from the <em>Settings</em> page after successful login.'),
'$newpass' => $new_password,
'$baseurl' => $a->get_baseurl()
diff --git a/mod/magic.php b/mod/magic.php
index 2fee87241..12679773b 100644
--- a/mod/magic.php
+++ b/mod/magic.php
@@ -105,6 +105,7 @@ function magic_init(&$a) {
$r = q("select * from channel left join hubloc on channel_hash = hubloc_hash where hubloc_addr = '%s' limit 1",
dbesc($delegate)
);
+
if($r && intval($r[0]['channel_id'])) {
$allowed = perm_is_allowed($r[0]['channel_id'],get_observer_hash(),'delegate');
if($allowed) {
@@ -112,6 +113,7 @@ function magic_init(&$a) {
$_SESSION['delegate'] = get_observer_hash();
$_SESSION['account_id'] = intval($r[0]['channel_account_id']);
change_channel($r[0]['channel_id']);
+
$delegation_success = true;
}
}
diff --git a/mod/manage.php b/mod/manage.php
index b609ede44..671003efd 100644
--- a/mod/manage.php
+++ b/mod/manage.php
@@ -148,6 +148,8 @@ function manage_content(&$a) {
for($x = 0; $x < count($delegates); $x ++) {
$delegates[$x]['link'] = 'magic?f=&dest=' . urlencode($delegates[$x]['xchan_url'])
. '&delegate=' . urlencode($delegates[$x]['xchan_addr']);
+ $delegates[$x]['channel_name'] = $delegates[$x]['xchan_name'];
+ $delegates[$x]['delegate'] = 1;
}
}
else {
diff --git a/mod/network.php b/mod/network.php
index ba2ef761b..17f57f498 100644
--- a/mod/network.php
+++ b/mod/network.php
@@ -204,7 +204,7 @@ function network_content(&$a, $update = 0, $load = false) {
}
else {
$contact_str = ' 0 ';
- info( t('Collection is empty'));
+ info( t('Privacy group is empty'));
}
$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 ) ";
@@ -213,7 +213,7 @@ function network_content(&$a, $update = 0, $load = false) {
if($x) {
$title = replace_macros(get_markup_template("section_title.tpl"),array(
- '$title' => t('Collection: ') . $x['name']
+ '$title' => t('Privacy group: ') . $x['name']
));
}
diff --git a/mod/new_channel.php b/mod/new_channel.php
index bec2a3c09..630984bf2 100644
--- a/mod/new_channel.php
+++ b/mod/new_channel.php
@@ -64,7 +64,14 @@ function new_channel_post(&$a) {
$arr = $_POST;
- if(($arr['account_id'] = get_account_id()) === false) {
+ $acc = $a->get_account();
+ $arr['account_id'] = get_account_id();
+
+ // prevent execution by delegated channels as well as those not logged in.
+ // get_account_id() returns the account_id from the session. But $a->account
+ // may point to the original authenticated account.
+
+ if((! $acc) || ($acc['account_id'] != $arr['account_id'])) {
notice( t('Permission denied.') . EOL );
return;
}
@@ -95,7 +102,10 @@ function new_channel_post(&$a) {
function new_channel_content(&$a) {
- if(! get_account_id()) {
+
+ $acc = $a->get_account();
+
+ if((! $acc) || $acc['account_id'] != get_account_id()) {
notice( t('Permission denied.') . EOL);
return;
}
@@ -123,6 +133,7 @@ function new_channel_content(&$a) {
'$label_name' => t('Channel Name'),
'$help_name' => t('Examples: "Bob Jameson", "Lisa and her Horses", "Soccer", "Aviation Group" '),
'$label_nick' => t('Choose a short nickname'),
+ '$nick_hub' => '@' . str_replace(array('http://','https://','/'), '', get_config('system','baseurl')),
'$nick_desc' => t('Your nickname will be used to create an easily remembered channel address (like an email address) which you can share with others.'),
'$label_import' => t('Or <a href="import">import an existing channel</a> from another location'),
'$name' => $name,
diff --git a/mod/photos.php b/mod/photos.php
index b0d9bc631..f1b7aceed 100644
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -463,7 +463,7 @@ function photos_post(&$a) {
$_REQUEST['group_deny'] = expand_acl($channel['channel_deny_gid']);
}
- $r = attach_store($a->channel,get_observer_hash(), '', $_REQUEST);
+ $r = attach_store($channel,get_observer_hash(), '', $_REQUEST);
if(! $r['success']) {
notice($r['message'] . EOL);
diff --git a/mod/ping.php b/mod/ping.php
index 394dbf089..69d504da1 100644
--- a/mod/ping.php
+++ b/mod/ping.php
@@ -299,7 +299,7 @@ function ping_init(&$a) {
if($r) {
foreach($r as $rr) {
$result[] = array(
- 'notify_link' => $a->get_baseurl() . '/connedit/' . $rr['abook_id'],
+ 'notify_link' => $a->get_baseurl() . '/connections/ifpending',
'name' => $rr['xchan_name'],
'url' => $rr['xchan_url'],
'photo' => $rr['xchan_photo_s'],
diff --git a/mod/settings.php b/mod/settings.php
index d2ba590a2..c1a4b019d 100644
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -354,7 +354,7 @@ function settings_post(&$a) {
);
}
else {
- notice( sprintf('Default privacy collection \'%s\' not found. Please create and re-submit permission change.', t('Friends')) . EOL);
+ notice( sprintf('Default privacy group \'%s\' not found. Please create and re-submit permission change.', t('Friends')) . EOL);
return;
}
}
@@ -917,6 +917,7 @@ function settings_content(&$a) {
$maxreq = $channel['channel_max_friend_req'];
$expire = $channel['channel_expire_days'];
$adult_flag = intval($channel['channel_pageflags'] & PAGE_ADULT);
+ $sys_expire = get_config('system','default_expire_days');
// $unkmail = $a->user['unkmail'];
// $cntunkmail = $a->user['cntunkmail'];
@@ -1050,7 +1051,7 @@ function settings_content(&$a) {
'$lbl_p2macro' => t('Advanced Privacy Settings'),
- '$expire' => array('expire',t('Expire other channel content after this many days'),$expire,t('0 or blank prevents expiration')),
+ '$expire' => array('expire',t('Expire other channel content after this many days'),$expire,sprintf( t('0 or blank to use the website limit. The website expires after %d days.'),intval($sys_expire))),
'$maxreq' => array('maxreq', t('Maximum Friend Requests/Day:'), intval($channel['channel_max_friend_req']) , t('May reduce spam activity')),
'$permissions' => t('Default Post Permissions'),
'$permdesc' => t("\x28click to open/close\x29"),
diff --git a/mod/thing.php b/mod/thing.php
index 280cc194d..7c5020e62 100644
--- a/mod/thing.php
+++ b/mod/thing.php
@@ -14,7 +14,6 @@ function thing_init(&$a) {
if(! local_channel())
return;
- $account_id = $a->get_account();
$channel = $a->get_channel();
$term_hash = (($_REQUEST['term_hash']) ? $_REQUEST['term_hash'] : '');
diff --git a/util/hmessages.po b/util/hmessages.po
index 1c1769fb5..f4ca7b494 100644
--- a/util/hmessages.po
+++ b/util/hmessages.po
@@ -6,9 +6,9 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: 2016-01-15.1279H\n"
+"Project-Id-Version: 2016-01-26.1290H\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-01-15 00:03-0800\n"
+"POT-Creation-Date: 2016-01-26 23:37-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -29,111 +29,9 @@ msgstr ""
msgid "Welcome %s. Remote authentication successful."
msgstr ""
-#: ../../boot.php:1319
-#, php-format
-msgid "Update %s failed. See error logs."
-msgstr ""
-
-#: ../../boot.php:1322
-#, php-format
-msgid "Update Error at %s"
-msgstr ""
-
-#: ../../boot.php:1489
-msgid ""
-"Create an account to access services and applications within the Hubzilla"
-msgstr ""
-
-#: ../../boot.php:1490 ../../include/nav.php:149 ../../mod/register.php:264
-msgid "Register"
-msgstr ""
-
-#: ../../boot.php:1507 ../../include/nav.php:82 ../../include/nav.php:114
-msgid "Logout"
-msgstr ""
-
-#: ../../boot.php:1508 ../../include/apps.php:131 ../../include/nav.php:111
-msgid "Login"
-msgstr ""
-
-#: ../../boot.php:1510 ../../include/contact_selectors.php:79
-#: ../../mod/admin.php:891 ../../mod/admin.php:900 ../../mod/id.php:15
-#: ../../mod/id.php:16
-msgid "Email"
-msgstr ""
-
-#: ../../boot.php:1511
-msgid "Password"
-msgstr ""
-
-#: ../../boot.php:1512
-msgid "Remember me"
-msgstr ""
-
-#: ../../boot.php:1512 ../../include/dir_fns.php:141
-#: ../../include/dir_fns.php:142 ../../include/dir_fns.php:143
-#: ../../mod/admin.php:421 ../../mod/api.php:102 ../../mod/events.php:447
-#: ../../mod/events.php:448 ../../mod/events.php:457
-#: ../../mod/filestorage.php:151 ../../mod/filestorage.php:159
-#: ../../mod/menu.php:96 ../../mod/menu.php:153 ../../mod/mitem.php:154
-#: ../../mod/mitem.php:155 ../../mod/mitem.php:228 ../../mod/mitem.php:229
-#: ../../mod/photos.php:626 ../../mod/removeme.php:60
-#: ../../mod/settings.php:577 ../../mod/connedit.php:644
-#: ../../mod/connedit.php:693 ../../view/theme/redbasic/php/config.php:104
-#: ../../view/theme/redbasic/php/config.php:129
-msgid "No"
-msgstr ""
-
-#: ../../boot.php:1512 ../../include/dir_fns.php:141
-#: ../../include/dir_fns.php:142 ../../include/dir_fns.php:143
-#: ../../mod/admin.php:423 ../../mod/api.php:101 ../../mod/events.php:447
-#: ../../mod/events.php:448 ../../mod/events.php:457
-#: ../../mod/filestorage.php:151 ../../mod/filestorage.php:159
-#: ../../mod/menu.php:96 ../../mod/menu.php:153 ../../mod/mitem.php:154
-#: ../../mod/mitem.php:155 ../../mod/mitem.php:228 ../../mod/mitem.php:229
-#: ../../mod/photos.php:626 ../../mod/removeme.php:60
-#: ../../mod/settings.php:577 ../../view/theme/redbasic/php/config.php:104
-#: ../../view/theme/redbasic/php/config.php:129
-msgid "Yes"
-msgstr ""
-
-#: ../../boot.php:1515
-msgid "Forgot your password?"
-msgstr ""
-
-#: ../../boot.php:1516 ../../mod/lostpass.php:86
-msgid "Password Reset"
-msgstr ""
-
-#: ../../boot.php:2137
-msgid "toggle mobile"
-msgstr ""
-
-#: ../../boot.php:2289
-msgid "Website SSL certificate is not valid. Please correct."
-msgstr ""
-
-#: ../../boot.php:2292
-#, php-format
-msgid "[hubzilla] Website SSL error for %s"
-msgstr ""
-
-#: ../../boot.php:2329
-msgid "Cron/Scheduled tasks not running."
-msgstr ""
-
-#: ../../boot.php:2330 ../../include/datetime.php:263
-msgid "never"
-msgstr ""
-
-#: ../../boot.php:2333
-#, php-format
-msgid "[hubzilla] Cron tasks not running on %s"
-msgstr ""
-
-#: ../../include/Contact.php:101 ../../include/conversation.php:953
-#: ../../include/identity.php:947 ../../include/widgets.php:137
-#: ../../include/widgets.php:175 ../../mod/directory.php:318
+#: ../../include/Contact.php:101 ../../include/conversation.php:961
+#: ../../include/identity.php:949 ../../include/widgets.php:137
+#: ../../include/widgets.php:175 ../../mod/directory.php:321
#: ../../mod/match.php:64 ../../mod/suggest.php:52
msgid "Connect"
msgstr ""
@@ -170,23 +68,23 @@ msgstr ""
#: ../../include/ItemObject.php:100 ../../include/RedDAV/RedBrowser.php:240
#: ../../include/apps.php:259 ../../include/menu.php:108
#: ../../include/page_widgets.php:8 ../../include/page_widgets.php:36
-#: ../../mod/blocks.php:153 ../../mod/connections.php:262
-#: ../../mod/connections.php:281 ../../mod/connections.php:301
-#: ../../mod/editblock.php:135 ../../mod/editlayout.php:134
-#: ../../mod/editpost.php:112 ../../mod/editwebpage.php:176
-#: ../../mod/layouts.php:183 ../../mod/menu.php:108 ../../mod/settings.php:648
-#: ../../mod/thing.php:257 ../../mod/webpages.php:181
+#: ../../mod/blocks.php:153 ../../mod/connections.php:286
+#: ../../mod/connections.php:306 ../../mod/editblock.php:135
+#: ../../mod/editlayout.php:134 ../../mod/editpost.php:112
+#: ../../mod/editwebpage.php:176 ../../mod/layouts.php:183
+#: ../../mod/menu.php:108 ../../mod/settings.php:648 ../../mod/thing.php:256
+#: ../../mod/webpages.php:181
msgid "Edit"
msgstr ""
#: ../../include/ItemObject.php:120 ../../include/RedDAV/RedBrowser.php:241
#: ../../include/apps.php:260 ../../include/conversation.php:657
#: ../../mod/admin.php:895 ../../mod/admin.php:1054 ../../mod/blocks.php:155
-#: ../../mod/connections.php:263 ../../mod/editblock.php:181
-#: ../../mod/editlayout.php:179 ../../mod/editwebpage.php:223
-#: ../../mod/group.php:173 ../../mod/photos.php:1126
-#: ../../mod/settings.php:649 ../../mod/connedit.php:560
-#: ../../mod/thing.php:258 ../../mod/webpages.php:183
+#: ../../mod/connections.php:259 ../../mod/connedit.php:560
+#: ../../mod/editblock.php:181 ../../mod/editlayout.php:179
+#: ../../mod/editwebpage.php:223 ../../mod/group.php:173
+#: ../../mod/photos.php:1126 ../../mod/settings.php:649
+#: ../../mod/thing.php:257 ../../mod/webpages.php:183
msgid "Delete"
msgstr ""
@@ -223,13 +121,13 @@ msgid "I abstain"
msgstr ""
#: ../../include/ItemObject.php:175 ../../include/ItemObject.php:187
-#: ../../include/conversation.php:1697 ../../mod/photos.php:1079
+#: ../../include/conversation.php:1707 ../../mod/photos.php:1079
#: ../../mod/photos.php:1091
msgid "View all"
msgstr ""
-#: ../../include/ItemObject.php:179 ../../include/conversation.php:1721
-#: ../../include/identity.php:1258 ../../include/taxonomy.php:414
+#: ../../include/ItemObject.php:179 ../../include/conversation.php:1731
+#: ../../include/taxonomy.php:414 ../../include/identity.php:1262
#: ../../mod/photos.php:1083
msgctxt "noun"
msgid "Like"
@@ -237,7 +135,7 @@ msgid_plural "Likes"
msgstr[0] ""
msgstr[1] ""
-#: ../../include/ItemObject.php:184 ../../include/conversation.php:1724
+#: ../../include/ItemObject.php:184 ../../include/conversation.php:1734
#: ../../mod/photos.php:1088
msgctxt "noun"
msgid "Dislike"
@@ -372,7 +270,7 @@ msgid "Close"
msgstr ""
#: ../../include/ItemObject.php:389 ../../include/conversation.php:740
-#: ../../include/conversation.php:1227 ../../mod/editblock.php:150
+#: ../../include/conversation.php:1237 ../../mod/editblock.php:150
#: ../../mod/editlayout.php:148 ../../mod/editpost.php:129
#: ../../mod/editwebpage.php:190 ../../mod/photos.php:1026
msgid "Please wait"
@@ -397,50 +295,50 @@ msgstr ""
#: ../../mod/admin.php:453 ../../mod/admin.php:596 ../../mod/admin.php:888
#: ../../mod/admin.php:1052 ../../mod/admin.php:1228 ../../mod/admin.php:1423
#: ../../mod/admin.php:1508 ../../mod/appman.php:99 ../../mod/chat.php:184
-#: ../../mod/chat.php:213 ../../mod/connect.php:93 ../../mod/events.php:461
-#: ../../mod/events.php:658 ../../mod/filestorage.php:156
-#: ../../mod/fsuggest.php:108 ../../mod/group.php:81 ../../mod/import.php:527
-#: ../../mod/import_items.php:122 ../../mod/invite.php:142
+#: ../../mod/chat.php:213 ../../mod/connect.php:93 ../../mod/connedit.php:720
+#: ../../mod/events.php:461 ../../mod/events.php:658
+#: ../../mod/filestorage.php:156 ../../mod/fsuggest.php:108
+#: ../../mod/group.php:81 ../../mod/import.php:527
+#: ../../mod/import_items.php:116 ../../mod/invite.php:142
#: ../../mod/locs.php:116 ../../mod/mail.php:380 ../../mod/mitem.php:231
-#: ../../mod/mood.php:135 ../../mod/pconfig.php:108 ../../mod/pdledit.php:58
+#: ../../mod/mood.php:135 ../../mod/pconfig.php:108 ../../mod/pdledit.php:59
#: ../../mod/photos.php:637 ../../mod/photos.php:1005
#: ../../mod/photos.php:1045 ../../mod/photos.php:1163 ../../mod/poke.php:171
#: ../../mod/profiles.php:675 ../../mod/rate.php:168
#: ../../mod/settings.php:586 ../../mod/settings.php:698
#: ../../mod/settings.php:726 ../../mod/settings.php:749
-#: ../../mod/settings.php:834 ../../mod/settings.php:1023
-#: ../../mod/setup.php:331 ../../mod/setup.php:371 ../../mod/connedit.php:724
-#: ../../mod/sources.php:104 ../../mod/sources.php:138 ../../mod/thing.php:313
-#: ../../mod/thing.php:359 ../../mod/xchan.php:11
-#: ../../view/theme/redbasic/php/config.php:99
+#: ../../mod/settings.php:834 ../../mod/settings.php:1024
+#: ../../mod/setup.php:331 ../../mod/setup.php:371 ../../mod/sources.php:104
+#: ../../mod/sources.php:138 ../../mod/thing.php:312 ../../mod/thing.php:358
+#: ../../mod/xchan.php:11 ../../view/theme/redbasic/php/config.php:99
msgid "Submit"
msgstr ""
-#: ../../include/ItemObject.php:698 ../../include/conversation.php:1199
+#: ../../include/ItemObject.php:698 ../../include/conversation.php:1209
#: ../../mod/editblock.php:136 ../../mod/editlayout.php:135
#: ../../mod/editpost.php:113 ../../mod/editwebpage.php:177
msgid "Bold"
msgstr ""
-#: ../../include/ItemObject.php:699 ../../include/conversation.php:1200
+#: ../../include/ItemObject.php:699 ../../include/conversation.php:1210
#: ../../mod/editblock.php:137 ../../mod/editlayout.php:136
#: ../../mod/editpost.php:114 ../../mod/editwebpage.php:178
msgid "Italic"
msgstr ""
-#: ../../include/ItemObject.php:700 ../../include/conversation.php:1201
+#: ../../include/ItemObject.php:700 ../../include/conversation.php:1211
#: ../../mod/editblock.php:138 ../../mod/editlayout.php:137
#: ../../mod/editpost.php:115 ../../mod/editwebpage.php:179
msgid "Underline"
msgstr ""
-#: ../../include/ItemObject.php:701 ../../include/conversation.php:1202
+#: ../../include/ItemObject.php:701 ../../include/conversation.php:1212
#: ../../mod/editblock.php:139 ../../mod/editlayout.php:138
#: ../../mod/editpost.php:116 ../../mod/editwebpage.php:180
msgid "Quote"
msgstr ""
-#: ../../include/ItemObject.php:702 ../../include/conversation.php:1203
+#: ../../include/ItemObject.php:702 ../../include/conversation.php:1213
#: ../../mod/editblock.php:140 ../../mod/editlayout.php:139
#: ../../mod/editpost.php:117 ../../mod/editwebpage.php:181
msgid "Code"
@@ -458,7 +356,7 @@ msgstr ""
msgid "Video"
msgstr ""
-#: ../../include/ItemObject.php:706 ../../include/conversation.php:1169
+#: ../../include/ItemObject.php:706 ../../include/conversation.php:1179
#: ../../include/page_widgets.php:40 ../../mod/editblock.php:171
#: ../../mod/editpost.php:149 ../../mod/editwebpage.php:212
#: ../../mod/events.php:458 ../../mod/photos.php:1046
@@ -466,7 +364,7 @@ msgstr ""
msgid "Preview"
msgstr ""
-#: ../../include/ItemObject.php:709 ../../include/conversation.php:1257
+#: ../../include/ItemObject.php:709 ../../include/conversation.php:1267
#: ../../mod/editpost.php:157 ../../mod/mail.php:255 ../../mod/mail.php:385
msgid "Encrypt text"
msgstr ""
@@ -501,14 +399,14 @@ msgid "Schedule Outbox"
msgstr ""
#: ../../include/RedDAV/RedBrowser.php:164 ../../include/apps.php:360
-#: ../../include/apps.php:415 ../../include/conversation.php:1027
-#: ../../include/widgets.php:1366 ../../mod/photos.php:754
+#: ../../include/apps.php:415 ../../include/conversation.php:1037
+#: ../../include/widgets.php:1376 ../../mod/photos.php:754
#: ../../mod/photos.php:1195
msgid "Unknown"
msgstr ""
#: ../../include/RedDAV/RedBrowser.php:226 ../../include/apps.php:135
-#: ../../include/conversation.php:1629 ../../include/nav.php:93
+#: ../../include/conversation.php:1639 ../../include/nav.php:93
#: ../../mod/fbrowser.php:109
msgid "Files"
msgstr ""
@@ -524,13 +422,13 @@ msgstr ""
#: ../../include/RedDAV/RedBrowser.php:230
#: ../../include/RedDAV/RedBrowser.php:303 ../../mod/blocks.php:152
#: ../../mod/layouts.php:175 ../../mod/menu.php:114
-#: ../../mod/new_channel.php:133 ../../mod/register.php:255
+#: ../../mod/new_channel.php:144 ../../mod/register.php:255
#: ../../mod/webpages.php:180
msgid "Create"
msgstr ""
#: ../../include/RedDAV/RedBrowser.php:231
-#: ../../include/RedDAV/RedBrowser.php:305 ../../include/widgets.php:1379
+#: ../../include/RedDAV/RedBrowser.php:305 ../../include/widgets.php:1389
#: ../../mod/photos.php:781 ../../mod/photos.php:1316
#: ../../mod/profile_photo.php:453 ../../mod/cover_photo.php:353
msgid "Upload"
@@ -616,7 +514,7 @@ msgid "Registration request at %s"
msgstr ""
#: ../../include/account.php:317 ../../include/account.php:344
-#: ../../include/account.php:404 ../../include/network.php:1659
+#: ../../include/account.php:404 ../../include/network.php:1660
msgid "Administrator"
msgstr ""
@@ -672,7 +570,7 @@ msgstr ""
#: ../../include/acl_selectors.php:251 ../../mod/chat.php:211
#: ../../mod/filestorage.php:147 ../../mod/photos.php:631
-#: ../../mod/photos.php:998 ../../mod/thing.php:310 ../../mod/thing.php:356
+#: ../../mod/photos.php:998 ../../mod/thing.php:309 ../../mod/thing.php:355
msgid "Permissions"
msgstr ""
@@ -707,7 +605,7 @@ msgstr ""
msgid "Site Admin"
msgstr ""
-#: ../../include/apps.php:129 ../../include/conversation.php:1655
+#: ../../include/apps.php:129 ../../include/conversation.php:1665
#: ../../include/nav.php:103
msgid "Bookmarks"
msgstr ""
@@ -716,8 +614,12 @@ msgstr ""
msgid "Address Book"
msgstr ""
+#: ../../include/apps.php:131 ../../include/nav.php:111 ../../boot.php:1517
+msgid "Login"
+msgstr ""
+
#: ../../include/apps.php:132 ../../include/nav.php:200
-#: ../../mod/manage.php:160
+#: ../../mod/manage.php:162
msgid "Channel Manager"
msgstr ""
@@ -731,7 +633,7 @@ msgstr ""
msgid "Settings"
msgstr ""
-#: ../../include/apps.php:136 ../../include/conversation.php:1665
+#: ../../include/apps.php:136 ../../include/conversation.php:1675
#: ../../include/nav.php:107 ../../mod/webpages.php:178
msgid "Webpages"
msgstr ""
@@ -740,12 +642,12 @@ msgstr ""
msgid "Channel Home"
msgstr ""
-#: ../../include/apps.php:138 ../../include/identity.php:1232
-#: ../../include/identity.php:1349 ../../mod/profperm.php:112
+#: ../../include/apps.php:138 ../../include/identity.php:1236
+#: ../../include/identity.php:1353 ../../mod/profperm.php:112
msgid "Profile"
msgstr ""
-#: ../../include/apps.php:139 ../../include/conversation.php:1622
+#: ../../include/apps.php:139 ../../include/conversation.php:1632
#: ../../include/nav.php:92 ../../mod/fbrowser.php:25
msgid "Photos"
msgstr ""
@@ -771,7 +673,7 @@ msgstr ""
msgid "Mood"
msgstr ""
-#: ../../include/apps.php:145 ../../include/conversation.php:956
+#: ../../include/apps.php:145 ../../include/conversation.php:965
msgid "Poke"
msgstr ""
@@ -781,7 +683,7 @@ msgstr ""
#: ../../include/apps.php:147 ../../include/nav.php:159
#: ../../include/text.php:885 ../../include/text.php:897
-#: ../../mod/connections.php:297 ../../mod/search.php:40
+#: ../../mod/connections.php:302 ../../mod/search.php:40
msgid "Search"
msgstr ""
@@ -801,7 +703,7 @@ msgstr ""
msgid "Invite"
msgstr ""
-#: ../../include/apps.php:152 ../../include/widgets.php:1252
+#: ../../include/apps.php:152 ../../include/widgets.php:1262
msgid "Features"
msgstr ""
@@ -837,39 +739,39 @@ msgstr ""
#: ../../include/attach.php:351 ../../include/attach.php:358
#: ../../include/attach.php:436 ../../include/attach.php:888
#: ../../include/attach.php:959 ../../include/attach.php:1111
-#: ../../include/chat.php:133 ../../include/items.php:4405
-#: ../../include/photos.php:29 ../../index.php:182 ../../index.php:367
+#: ../../include/chat.php:133 ../../include/photos.php:29
+#: ../../include/items.php:4429 ../../index.php:186 ../../index.php:371
#: ../../mod/achievements.php:30 ../../mod/api.php:26 ../../mod/api.php:31
#: ../../mod/appman.php:66 ../../mod/authtest.php:13 ../../mod/block.php:22
#: ../../mod/block.php:72 ../../mod/blocks.php:69 ../../mod/blocks.php:76
#: ../../mod/bookmarks.php:48 ../../mod/channel.php:100
-#: ../../mod/channel.php:214 ../../mod/channel.php:254 ../../mod/chat.php:94
+#: ../../mod/channel.php:215 ../../mod/channel.php:255 ../../mod/chat.php:94
#: ../../mod/chat.php:99 ../../mod/common.php:35 ../../mod/connections.php:29
-#: ../../mod/editblock.php:65 ../../mod/editlayout.php:63
-#: ../../mod/editlayout.php:87 ../../mod/editpost.php:13
-#: ../../mod/editwebpage.php:64 ../../mod/editwebpage.php:86
-#: ../../mod/editwebpage.php:101 ../../mod/editwebpage.php:125
-#: ../../mod/events.php:260 ../../mod/filestorage.php:18
-#: ../../mod/filestorage.php:73 ../../mod/filestorage.php:88
-#: ../../mod/filestorage.php:115 ../../mod/fsuggest.php:78
-#: ../../mod/group.php:9 ../../mod/id.php:71 ../../mod/invite.php:13
-#: ../../mod/invite.php:87 ../../mod/item.php:206 ../../mod/item.php:214
-#: ../../mod/item.php:1049 ../../mod/layouts.php:69 ../../mod/layouts.php:76
-#: ../../mod/layouts.php:87 ../../mod/like.php:177 ../../mod/locs.php:83
-#: ../../mod/mail.php:126 ../../mod/manage.php:6 ../../mod/menu.php:74
-#: ../../mod/message.php:16 ../../mod/mitem.php:111 ../../mod/mood.php:112
-#: ../../mod/network.php:12 ../../mod/new_channel.php:68
-#: ../../mod/new_channel.php:99 ../../mod/notifications.php:66
-#: ../../mod/page.php:31 ../../mod/page.php:86 ../../mod/pdledit.php:21
-#: ../../mod/photos.php:70 ../../mod/poke.php:133 ../../mod/profile.php:64
-#: ../../mod/profile.php:72 ../../mod/profile_photo.php:341
-#: ../../mod/profile_photo.php:354 ../../mod/profiles.php:198
-#: ../../mod/profiles.php:584 ../../mod/rate.php:111 ../../mod/register.php:73
-#: ../../mod/regmod.php:17 ../../mod/service_limits.php:7
-#: ../../mod/settings.php:568 ../../mod/setup.php:227
-#: ../../mod/connedit.php:355 ../../mod/sharedwithme.php:7
-#: ../../mod/sources.php:66 ../../mod/suggest.php:26 ../../mod/thing.php:271
-#: ../../mod/thing.php:291 ../../mod/thing.php:328
+#: ../../mod/connedit.php:355 ../../mod/editblock.php:65
+#: ../../mod/editlayout.php:63 ../../mod/editlayout.php:87
+#: ../../mod/editpost.php:13 ../../mod/editwebpage.php:64
+#: ../../mod/editwebpage.php:86 ../../mod/editwebpage.php:101
+#: ../../mod/editwebpage.php:125 ../../mod/events.php:260
+#: ../../mod/filestorage.php:18 ../../mod/filestorage.php:73
+#: ../../mod/filestorage.php:88 ../../mod/filestorage.php:115
+#: ../../mod/fsuggest.php:78 ../../mod/group.php:9 ../../mod/id.php:71
+#: ../../mod/invite.php:13 ../../mod/invite.php:87 ../../mod/item.php:206
+#: ../../mod/item.php:214 ../../mod/item.php:1050 ../../mod/layouts.php:69
+#: ../../mod/layouts.php:76 ../../mod/layouts.php:87 ../../mod/like.php:177
+#: ../../mod/locs.php:83 ../../mod/mail.php:126 ../../mod/manage.php:6
+#: ../../mod/menu.php:74 ../../mod/message.php:16 ../../mod/mitem.php:111
+#: ../../mod/mood.php:112 ../../mod/network.php:12
+#: ../../mod/new_channel.php:75 ../../mod/new_channel.php:109
+#: ../../mod/notifications.php:66 ../../mod/page.php:31 ../../mod/page.php:86
+#: ../../mod/pdledit.php:22 ../../mod/photos.php:70 ../../mod/poke.php:133
+#: ../../mod/profile.php:64 ../../mod/profile.php:72
+#: ../../mod/profile_photo.php:341 ../../mod/profile_photo.php:354
+#: ../../mod/profiles.php:198 ../../mod/profiles.php:584
+#: ../../mod/rate.php:111 ../../mod/register.php:73 ../../mod/regmod.php:17
+#: ../../mod/service_limits.php:7 ../../mod/settings.php:568
+#: ../../mod/setup.php:227 ../../mod/sharedwithme.php:7
+#: ../../mod/sources.php:66 ../../mod/suggest.php:26 ../../mod/thing.php:270
+#: ../../mod/thing.php:290 ../../mod/thing.php:327
#: ../../mod/viewconnections.php:22 ../../mod/viewconnections.php:27
#: ../../mod/viewsrc.php:14 ../../mod/webpages.php:69
#: ../../mod/cover_photo.php:273 ../../mod/cover_photo.php:286
@@ -974,8 +876,8 @@ msgid "Finishes:"
msgstr ""
#: ../../include/bb2diaspora.php:487 ../../include/event.php:52
-#: ../../include/identity.php:998 ../../include/text.php:1425
-#: ../../mod/directory.php:304
+#: ../../include/identity.php:1000 ../../include/text.php:1425
+#: ../../mod/directory.php:307
msgid "Location:"
msgstr ""
@@ -1071,66 +973,6 @@ msgstr ""
msgid "Default"
msgstr ""
-#: ../../include/contact_selectors.php:56
-msgid "Frequently"
-msgstr ""
-
-#: ../../include/contact_selectors.php:57
-msgid "Hourly"
-msgstr ""
-
-#: ../../include/contact_selectors.php:58
-msgid "Twice daily"
-msgstr ""
-
-#: ../../include/contact_selectors.php:59
-msgid "Daily"
-msgstr ""
-
-#: ../../include/contact_selectors.php:60
-msgid "Weekly"
-msgstr ""
-
-#: ../../include/contact_selectors.php:61
-msgid "Monthly"
-msgstr ""
-
-#: ../../include/contact_selectors.php:76
-msgid "Friendica"
-msgstr ""
-
-#: ../../include/contact_selectors.php:77
-msgid "OStatus"
-msgstr ""
-
-#: ../../include/contact_selectors.php:78
-msgid "RSS/Atom"
-msgstr ""
-
-#: ../../include/contact_selectors.php:80
-msgid "Diaspora"
-msgstr ""
-
-#: ../../include/contact_selectors.php:81
-msgid "Facebook"
-msgstr ""
-
-#: ../../include/contact_selectors.php:82
-msgid "Zot!"
-msgstr ""
-
-#: ../../include/contact_selectors.php:83
-msgid "LinkedIn"
-msgstr ""
-
-#: ../../include/contact_selectors.php:84
-msgid "XMPP/IM"
-msgstr ""
-
-#: ../../include/contact_selectors.php:85
-msgid "MySpace"
-msgstr ""
-
#: ../../include/contact_widgets.php:14
#, php-format
msgid "%d invitation available"
@@ -1158,12 +1000,12 @@ msgstr ""
msgid "Examples: Robert Morgenstein, Fishing"
msgstr ""
-#: ../../include/contact_widgets.php:26 ../../mod/connections.php:300
-#: ../../mod/directory.php:381 ../../mod/directory.php:386
+#: ../../include/contact_widgets.php:26 ../../mod/connections.php:305
+#: ../../mod/directory.php:384 ../../mod/directory.php:389
msgid "Find"
msgstr ""
-#: ../../include/contact_widgets.php:27 ../../mod/directory.php:385
+#: ../../include/contact_widgets.php:27 ../../mod/directory.php:388
#: ../../mod/suggest.php:60
msgid "Channel Suggestions"
msgstr ""
@@ -1180,7 +1022,7 @@ msgstr ""
msgid "Advanced example: name=fred and country=iceland"
msgstr ""
-#: ../../include/contact_widgets.php:57 ../../include/features.php:92
+#: ../../include/contact_widgets.php:57 ../../include/features.php:93
#: ../../include/widgets.php:304
msgid "Saved Folders"
msgstr ""
@@ -1330,389 +1172,385 @@ msgstr ""
msgid "Delete Selected Items"
msgstr ""
-#: ../../include/conversation.php:946
+#: ../../include/conversation.php:953
msgid "View Source"
msgstr ""
-#: ../../include/conversation.php:947
+#: ../../include/conversation.php:954
msgid "Follow Thread"
msgstr ""
-#: ../../include/conversation.php:948
+#: ../../include/conversation.php:955
msgid "Unfollow Thread"
msgstr ""
-#: ../../include/conversation.php:949
-msgid "View Status"
-msgstr ""
-
-#: ../../include/conversation.php:950 ../../include/nav.php:86
+#: ../../include/conversation.php:959 ../../include/nav.php:86
#: ../../mod/connedit.php:507
msgid "View Profile"
msgstr ""
-#: ../../include/conversation.php:951
-msgid "View Photos"
-msgstr ""
-
-#: ../../include/conversation.php:952
+#: ../../include/conversation.php:960
msgid "Activity/Posts"
msgstr ""
-#: ../../include/conversation.php:954
+#: ../../include/conversation.php:962
msgid "Edit Connection"
msgstr ""
-#: ../../include/conversation.php:955
-msgid "Send PM"
+#: ../../include/conversation.php:963
+msgid "Message"
msgstr ""
-#: ../../include/conversation.php:1070
+#: ../../include/conversation.php:964 ../../mod/ratings.php:99
+msgid "Ratings"
+msgstr ""
+
+#: ../../include/conversation.php:1080
#, php-format
msgid "%s likes this."
msgstr ""
-#: ../../include/conversation.php:1070
+#: ../../include/conversation.php:1080
#, php-format
msgid "%s doesn't like this."
msgstr ""
-#: ../../include/conversation.php:1074
+#: ../../include/conversation.php:1084
#, php-format
msgid "<span %1$s>%2$d people</span> like this."
msgid_plural "<span %1$s>%2$d people</span> like this."
msgstr[0] ""
msgstr[1] ""
-#: ../../include/conversation.php:1076
+#: ../../include/conversation.php:1086
#, php-format
msgid "<span %1$s>%2$d people</span> don't like this."
msgid_plural "<span %1$s>%2$d people</span> don't like this."
msgstr[0] ""
msgstr[1] ""
-#: ../../include/conversation.php:1082
+#: ../../include/conversation.php:1092
msgid "and"
msgstr ""
-#: ../../include/conversation.php:1085
+#: ../../include/conversation.php:1095
#, php-format
msgid ", and %d other people"
msgid_plural ", and %d other people"
msgstr[0] ""
msgstr[1] ""
-#: ../../include/conversation.php:1086
+#: ../../include/conversation.php:1096
#, php-format
msgid "%s like this."
msgstr ""
-#: ../../include/conversation.php:1086
+#: ../../include/conversation.php:1096
#, php-format
msgid "%s don't like this."
msgstr ""
-#: ../../include/conversation.php:1154
+#: ../../include/conversation.php:1164
msgid "Visible to <strong>everybody</strong>"
msgstr ""
-#: ../../include/conversation.php:1155 ../../mod/mail.php:202
+#: ../../include/conversation.php:1165 ../../mod/mail.php:202
#: ../../mod/mail.php:316
msgid "Please enter a link URL:"
msgstr ""
-#: ../../include/conversation.php:1156
+#: ../../include/conversation.php:1166
msgid "Please enter a video link/URL:"
msgstr ""
-#: ../../include/conversation.php:1157
+#: ../../include/conversation.php:1167
msgid "Please enter an audio link/URL:"
msgstr ""
-#: ../../include/conversation.php:1158
+#: ../../include/conversation.php:1168
msgid "Tag term:"
msgstr ""
-#: ../../include/conversation.php:1159 ../../mod/filer.php:48
+#: ../../include/conversation.php:1169 ../../mod/filer.php:48
msgid "Save to Folder:"
msgstr ""
-#: ../../include/conversation.php:1160
+#: ../../include/conversation.php:1170
msgid "Where are you right now?"
msgstr ""
-#: ../../include/conversation.php:1161 ../../mod/editpost.php:56
+#: ../../include/conversation.php:1171 ../../mod/editpost.php:56
#: ../../mod/mail.php:203 ../../mod/mail.php:317
msgid "Expires YYYY-MM-DD HH:MM"
msgstr ""
-#: ../../include/conversation.php:1192 ../../mod/blocks.php:154
+#: ../../include/conversation.php:1202 ../../mod/blocks.php:154
#: ../../mod/layouts.php:184 ../../mod/photos.php:1025
#: ../../mod/webpages.php:182
msgid "Share"
msgstr ""
-#: ../../include/conversation.php:1194
+#: ../../include/conversation.php:1204
msgid "Page link name"
msgstr ""
-#: ../../include/conversation.php:1197
+#: ../../include/conversation.php:1207
msgid "Post as"
msgstr ""
-#: ../../include/conversation.php:1204 ../../mod/editblock.php:142
+#: ../../include/conversation.php:1214 ../../mod/editblock.php:142
#: ../../mod/editlayout.php:140 ../../mod/editpost.php:118
#: ../../mod/editwebpage.php:182
msgid "Upload photo"
msgstr ""
-#: ../../include/conversation.php:1205
+#: ../../include/conversation.php:1215
msgid "upload photo"
msgstr ""
-#: ../../include/conversation.php:1206 ../../mod/editblock.php:143
+#: ../../include/conversation.php:1216 ../../mod/editblock.php:143
#: ../../mod/editlayout.php:141 ../../mod/editpost.php:119
#: ../../mod/editwebpage.php:183 ../../mod/mail.php:248 ../../mod/mail.php:378
msgid "Attach file"
msgstr ""
-#: ../../include/conversation.php:1207
+#: ../../include/conversation.php:1217
msgid "attach file"
msgstr ""
-#: ../../include/conversation.php:1208 ../../mod/editblock.php:144
+#: ../../include/conversation.php:1218 ../../mod/editblock.php:144
#: ../../mod/editlayout.php:142 ../../mod/editpost.php:120
#: ../../mod/editwebpage.php:184 ../../mod/mail.php:249 ../../mod/mail.php:379
msgid "Insert web link"
msgstr ""
-#: ../../include/conversation.php:1209
+#: ../../include/conversation.php:1219
msgid "web link"
msgstr ""
-#: ../../include/conversation.php:1210
+#: ../../include/conversation.php:1220
msgid "Insert video link"
msgstr ""
-#: ../../include/conversation.php:1211
+#: ../../include/conversation.php:1221
msgid "video link"
msgstr ""
-#: ../../include/conversation.php:1212
+#: ../../include/conversation.php:1222
msgid "Insert audio link"
msgstr ""
-#: ../../include/conversation.php:1213
+#: ../../include/conversation.php:1223
msgid "audio link"
msgstr ""
-#: ../../include/conversation.php:1214 ../../mod/editblock.php:148
+#: ../../include/conversation.php:1224 ../../mod/editblock.php:148
#: ../../mod/editlayout.php:146 ../../mod/editpost.php:124
#: ../../mod/editwebpage.php:188
msgid "Set your location"
msgstr ""
-#: ../../include/conversation.php:1215
+#: ../../include/conversation.php:1225
msgid "set location"
msgstr ""
-#: ../../include/conversation.php:1216 ../../mod/editpost.php:126
+#: ../../include/conversation.php:1226 ../../mod/editpost.php:126
msgid "Toggle voting"
msgstr ""
-#: ../../include/conversation.php:1219 ../../mod/editblock.php:149
+#: ../../include/conversation.php:1229 ../../mod/editblock.php:149
#: ../../mod/editlayout.php:147 ../../mod/editpost.php:125
#: ../../mod/editwebpage.php:189
msgid "Clear browser location"
msgstr ""
-#: ../../include/conversation.php:1220
+#: ../../include/conversation.php:1230
msgid "clear location"
msgstr ""
-#: ../../include/conversation.php:1222 ../../mod/editblock.php:162
+#: ../../include/conversation.php:1232 ../../mod/editblock.php:162
#: ../../mod/editpost.php:141 ../../mod/editwebpage.php:205
msgid "Title (optional)"
msgstr ""
-#: ../../include/conversation.php:1226 ../../mod/editblock.php:165
+#: ../../include/conversation.php:1236 ../../mod/editblock.php:165
#: ../../mod/editlayout.php:163 ../../mod/editpost.php:143
#: ../../mod/editwebpage.php:207
msgid "Categories (optional, comma-separated list)"
msgstr ""
-#: ../../include/conversation.php:1228 ../../mod/editblock.php:151
+#: ../../include/conversation.php:1238 ../../mod/editblock.php:151
#: ../../mod/editlayout.php:149 ../../mod/editpost.php:130
#: ../../mod/editwebpage.php:191 ../../mod/events.php:459
msgid "Permission settings"
msgstr ""
-#: ../../include/conversation.php:1229
+#: ../../include/conversation.php:1239
msgid "permissions"
msgstr ""
-#: ../../include/conversation.php:1237 ../../mod/editblock.php:159
+#: ../../include/conversation.php:1247 ../../mod/editblock.php:159
#: ../../mod/editlayout.php:156 ../../mod/editpost.php:138
#: ../../mod/editwebpage.php:200
msgid "Public post"
msgstr ""
-#: ../../include/conversation.php:1239 ../../mod/editblock.php:166
+#: ../../include/conversation.php:1249 ../../mod/editblock.php:166
#: ../../mod/editlayout.php:164 ../../mod/editpost.php:144
#: ../../mod/editwebpage.php:208
msgid "Example: bob@example.com, mary@example.com"
msgstr ""
-#: ../../include/conversation.php:1252 ../../mod/editblock.php:176
+#: ../../include/conversation.php:1262 ../../mod/editblock.php:176
#: ../../mod/editlayout.php:173 ../../mod/editpost.php:155
#: ../../mod/editwebpage.php:217 ../../mod/mail.php:253 ../../mod/mail.php:383
msgid "Set expiration date"
msgstr ""
-#: ../../include/conversation.php:1255
+#: ../../include/conversation.php:1265
msgid "Set publish date"
msgstr ""
-#: ../../include/conversation.php:1259 ../../mod/editpost.php:159
+#: ../../include/conversation.php:1269 ../../mod/editpost.php:159
msgid "OK"
msgstr ""
-#: ../../include/conversation.php:1260 ../../mod/editpost.php:160
+#: ../../include/conversation.php:1270 ../../mod/editpost.php:160
#: ../../mod/fbrowser.php:77 ../../mod/fbrowser.php:112
#: ../../mod/settings.php:587 ../../mod/settings.php:613
#: ../../mod/tagrm.php:11 ../../mod/tagrm.php:134
msgid "Cancel"
msgstr ""
-#: ../../include/conversation.php:1503
+#: ../../include/conversation.php:1513
msgid "Discover"
msgstr ""
-#: ../../include/conversation.php:1506
+#: ../../include/conversation.php:1516
msgid "Imported public streams"
msgstr ""
-#: ../../include/conversation.php:1511
+#: ../../include/conversation.php:1521
msgid "Commented Order"
msgstr ""
-#: ../../include/conversation.php:1514
+#: ../../include/conversation.php:1524
msgid "Sort by Comment Date"
msgstr ""
-#: ../../include/conversation.php:1518
+#: ../../include/conversation.php:1528
msgid "Posted Order"
msgstr ""
-#: ../../include/conversation.php:1521
+#: ../../include/conversation.php:1531
msgid "Sort by Post Date"
msgstr ""
-#: ../../include/conversation.php:1526 ../../include/widgets.php:95
+#: ../../include/conversation.php:1536 ../../include/widgets.php:95
msgid "Personal"
msgstr ""
-#: ../../include/conversation.php:1529
+#: ../../include/conversation.php:1539
msgid "Posts that mention or involve you"
msgstr ""
-#: ../../include/conversation.php:1535 ../../mod/connections.php:72
+#: ../../include/conversation.php:1545 ../../mod/connections.php:72
#: ../../mod/connections.php:82 ../../mod/menu.php:112
msgid "New"
msgstr ""
-#: ../../include/conversation.php:1538
+#: ../../include/conversation.php:1548
msgid "Activity Stream - by date"
msgstr ""
-#: ../../include/conversation.php:1544
+#: ../../include/conversation.php:1554
msgid "Starred"
msgstr ""
-#: ../../include/conversation.php:1547
+#: ../../include/conversation.php:1557
msgid "Favourite Posts"
msgstr ""
-#: ../../include/conversation.php:1554
+#: ../../include/conversation.php:1564
msgid "Spam"
msgstr ""
-#: ../../include/conversation.php:1557
+#: ../../include/conversation.php:1567
msgid "Posts flagged as SPAM"
msgstr ""
-#: ../../include/conversation.php:1601 ../../mod/admin.php:1059
+#: ../../include/conversation.php:1611 ../../mod/admin.php:1059
msgid "Channel"
msgstr ""
-#: ../../include/conversation.php:1604
+#: ../../include/conversation.php:1614
msgid "Status Messages and Posts"
msgstr ""
-#: ../../include/conversation.php:1613
+#: ../../include/conversation.php:1623
msgid "About"
msgstr ""
-#: ../../include/conversation.php:1616
+#: ../../include/conversation.php:1626
msgid "Profile Details"
msgstr ""
-#: ../../include/conversation.php:1625 ../../include/photos.php:506
+#: ../../include/conversation.php:1635 ../../include/photos.php:506
msgid "Photo Albums"
msgstr ""
-#: ../../include/conversation.php:1632
+#: ../../include/conversation.php:1642
msgid "Files and Storage"
msgstr ""
-#: ../../include/conversation.php:1642 ../../include/conversation.php:1645
+#: ../../include/conversation.php:1652 ../../include/conversation.php:1655
msgid "Chatrooms"
msgstr ""
-#: ../../include/conversation.php:1658
+#: ../../include/conversation.php:1668
msgid "Saved Bookmarks"
msgstr ""
-#: ../../include/conversation.php:1668
+#: ../../include/conversation.php:1678
msgid "Manage Webpages"
msgstr ""
-#: ../../include/conversation.php:1727
+#: ../../include/conversation.php:1737
msgctxt "noun"
msgid "Attending"
msgid_plural "Attending"
msgstr[0] ""
msgstr[1] ""
-#: ../../include/conversation.php:1730
+#: ../../include/conversation.php:1740
msgctxt "noun"
msgid "Not Attending"
msgid_plural "Not Attending"
msgstr[0] ""
msgstr[1] ""
-#: ../../include/conversation.php:1733
+#: ../../include/conversation.php:1743
msgctxt "noun"
msgid "Undecided"
msgid_plural "Undecided"
msgstr[0] ""
msgstr[1] ""
-#: ../../include/conversation.php:1736
+#: ../../include/conversation.php:1746
msgctxt "noun"
msgid "Agree"
msgid_plural "Agrees"
msgstr[0] ""
msgstr[1] ""
-#: ../../include/conversation.php:1739
+#: ../../include/conversation.php:1749
msgctxt "noun"
msgid "Disagree"
msgid_plural "Disagrees"
msgstr[0] ""
msgstr[1] ""
-#: ../../include/conversation.php:1742
+#: ../../include/conversation.php:1752
msgctxt "noun"
msgid "Abstain"
msgid_plural "Abstains"
@@ -1732,6 +1570,10 @@ msgstr ""
msgid "Required"
msgstr ""
+#: ../../include/datetime.php:263 ../../boot.php:2347
+msgid "never"
+msgstr ""
+
#: ../../include/datetime.php:269
msgid "less than a second ago"
msgstr ""
@@ -1821,207 +1663,37 @@ msgstr ""
msgid "Safe Mode"
msgstr ""
-#: ../../include/dir_fns.php:142
-msgid "Public Forums Only"
-msgstr ""
-
-#: ../../include/dir_fns.php:143
-msgid "This Website Only"
-msgstr ""
-
-#: ../../include/enotify.php:57 ../../include/network.php:1612
-msgid "$Projectname Notification"
-msgstr ""
-
-#: ../../include/enotify.php:58 ../../include/network.php:1613
-msgid "$projectname"
-msgstr ""
-
-#: ../../include/enotify.php:60 ../../include/network.php:1615
-msgid "Thank You,"
-msgstr ""
-
-#: ../../include/enotify.php:62 ../../include/network.php:1617
-#, php-format
-msgid "%s Administrator"
-msgstr ""
-
-#: ../../include/enotify.php:96
-#, php-format
-msgid "%s <!item_type!>"
-msgstr ""
-
-#: ../../include/enotify.php:100
-#, php-format
-msgid "[Hubzilla:Notify] New mail received at %s"
-msgstr ""
-
-#: ../../include/enotify.php:102
-#, php-format
-msgid "%1$s, %2$s sent you a new private message at %3$s."
-msgstr ""
-
-#: ../../include/enotify.php:103
-#, php-format
-msgid "%1$s sent you %2$s."
-msgstr ""
-
-#: ../../include/enotify.php:103
-msgid "a private message"
-msgstr ""
-
-#: ../../include/enotify.php:104
-#, php-format
-msgid "Please visit %s to view and/or reply to your private messages."
-msgstr ""
-
-#: ../../include/enotify.php:160
-#, php-format
-msgid "%1$s, %2$s commented on [zrl=%3$s]a %4$s[/zrl]"
-msgstr ""
-
-#: ../../include/enotify.php:168
-#, php-format
-msgid "%1$s, %2$s commented on [zrl=%3$s]%4$s's %5$s[/zrl]"
-msgstr ""
-
-#: ../../include/enotify.php:177
-#, php-format
-msgid "%1$s, %2$s commented on [zrl=%3$s]your %4$s[/zrl]"
-msgstr ""
-
-#: ../../include/enotify.php:188
-#, php-format
-msgid "[Hubzilla:Notify] Comment to conversation #%1$d by %2$s"
-msgstr ""
-
-#: ../../include/enotify.php:189
-#, php-format
-msgid "%1$s, %2$s commented on an item/conversation you have been following."
-msgstr ""
-
-#: ../../include/enotify.php:192 ../../include/enotify.php:207
-#: ../../include/enotify.php:233 ../../include/enotify.php:251
-#: ../../include/enotify.php:265
-#, php-format
-msgid "Please visit %s to view and/or reply to the conversation."
-msgstr ""
-
-#: ../../include/enotify.php:198
-#, php-format
-msgid "[Hubzilla:Notify] %s posted to your profile wall"
-msgstr ""
-
-#: ../../include/enotify.php:200
-#, php-format
-msgid "%1$s, %2$s posted to your profile wall at %3$s"
-msgstr ""
-
-#: ../../include/enotify.php:202
-#, php-format
-msgid "%1$s, %2$s posted to [zrl=%3$s]your wall[/zrl]"
-msgstr ""
-
-#: ../../include/enotify.php:226
-#, php-format
-msgid "[Hubzilla:Notify] %s tagged you"
-msgstr ""
-
-#: ../../include/enotify.php:227
-#, php-format
-msgid "%1$s, %2$s tagged you at %3$s"
-msgstr ""
-
-#: ../../include/enotify.php:228
-#, php-format
-msgid "%1$s, %2$s [zrl=%3$s]tagged you[/zrl]."
-msgstr ""
-
-#: ../../include/enotify.php:240
-#, php-format
-msgid "[Hubzilla:Notify] %1$s poked you"
-msgstr ""
-
-#: ../../include/enotify.php:241
-#, php-format
-msgid "%1$s, %2$s poked you at %3$s"
-msgstr ""
-
-#: ../../include/enotify.php:242
-#, php-format
-msgid "%1$s, %2$s [zrl=%2$s]poked you[/zrl]."
-msgstr ""
-
-#: ../../include/enotify.php:258
-#, php-format
-msgid "[Hubzilla:Notify] %s tagged your post"
-msgstr ""
-
-#: ../../include/enotify.php:259
-#, php-format
-msgid "%1$s, %2$s tagged your post at %3$s"
-msgstr ""
-
-#: ../../include/enotify.php:260
-#, php-format
-msgid "%1$s, %2$s tagged [zrl=%3$s]your post[/zrl]"
-msgstr ""
-
-#: ../../include/enotify.php:272
-msgid "[Hubzilla:Notify] Introduction received"
-msgstr ""
-
-#: ../../include/enotify.php:273
-#, php-format
-msgid "%1$s, you've received an new connection request from '%2$s' at %3$s"
-msgstr ""
-
-#: ../../include/enotify.php:274
-#, php-format
-msgid ""
-"%1$s, you've received [zrl=%2$s]a new connection request[/zrl] from %3$s."
-msgstr ""
-
-#: ../../include/enotify.php:278 ../../include/enotify.php:297
-#, php-format
-msgid "You may visit their profile at %s"
-msgstr ""
-
-#: ../../include/enotify.php:280
-#, php-format
-msgid "Please visit %s to approve or reject the connection request."
-msgstr ""
-
-#: ../../include/enotify.php:287
-msgid "[Hubzilla:Notify] Friend suggestion received"
-msgstr ""
-
-#: ../../include/enotify.php:288
-#, php-format
-msgid "%1$s, you've received a friend suggestion from '%2$s' at %3$s"
-msgstr ""
-
-#: ../../include/enotify.php:289
-#, php-format
-msgid ""
-"%1$s, you've received [zrl=%2$s]a friend suggestion[/zrl] for %3$s from %4$s."
-msgstr ""
-
-#: ../../include/enotify.php:295
-msgid "Name:"
+#: ../../include/dir_fns.php:141 ../../include/dir_fns.php:142
+#: ../../include/dir_fns.php:143 ../../mod/admin.php:421 ../../mod/api.php:102
+#: ../../mod/connedit.php:644 ../../mod/connedit.php:693
+#: ../../mod/events.php:447 ../../mod/events.php:448 ../../mod/events.php:457
+#: ../../mod/filestorage.php:151 ../../mod/filestorage.php:159
+#: ../../mod/menu.php:96 ../../mod/menu.php:153 ../../mod/mitem.php:154
+#: ../../mod/mitem.php:155 ../../mod/mitem.php:228 ../../mod/mitem.php:229
+#: ../../mod/photos.php:626 ../../mod/removeme.php:60
+#: ../../mod/settings.php:577 ../../view/theme/redbasic/php/config.php:104
+#: ../../view/theme/redbasic/php/config.php:129 ../../boot.php:1521
+msgid "No"
msgstr ""
-#: ../../include/enotify.php:296
-msgid "Photo:"
+#: ../../include/dir_fns.php:141 ../../include/dir_fns.php:142
+#: ../../include/dir_fns.php:143 ../../mod/admin.php:423 ../../mod/api.php:101
+#: ../../mod/events.php:447 ../../mod/events.php:448 ../../mod/events.php:457
+#: ../../mod/filestorage.php:151 ../../mod/filestorage.php:159
+#: ../../mod/menu.php:96 ../../mod/menu.php:153 ../../mod/mitem.php:154
+#: ../../mod/mitem.php:155 ../../mod/mitem.php:228 ../../mod/mitem.php:229
+#: ../../mod/photos.php:626 ../../mod/removeme.php:60
+#: ../../mod/settings.php:577 ../../view/theme/redbasic/php/config.php:104
+#: ../../view/theme/redbasic/php/config.php:129 ../../boot.php:1521
+msgid "Yes"
msgstr ""
-#: ../../include/enotify.php:299
-#, php-format
-msgid "Please visit %s to approve or reject the suggestion."
+#: ../../include/dir_fns.php:142
+msgid "Public Forums Only"
msgstr ""
-#: ../../include/enotify.php:514
-msgid "[Hubzilla:Notify]"
+#: ../../include/dir_fns.php:143
+msgid "This Website Only"
msgstr ""
#: ../../include/event.php:768
@@ -2048,274 +1720,6 @@ msgstr ""
msgid "Cancelled"
msgstr ""
-#: ../../include/features.php:45
-msgid "General Features"
-msgstr ""
-
-#: ../../include/features.php:47
-msgid "Content Expiration"
-msgstr ""
-
-#: ../../include/features.php:47
-msgid "Remove posts/comments and/or private messages at a future time"
-msgstr ""
-
-#: ../../include/features.php:48
-msgid "Multiple Profiles"
-msgstr ""
-
-#: ../../include/features.php:48
-msgid "Ability to create multiple profiles"
-msgstr ""
-
-#: ../../include/features.php:49
-msgid "Advanced Profiles"
-msgstr ""
-
-#: ../../include/features.php:49
-msgid "Additional profile sections and selections"
-msgstr ""
-
-#: ../../include/features.php:50
-msgid "Profile Import/Export"
-msgstr ""
-
-#: ../../include/features.php:50
-msgid "Save and load profile details across sites/channels"
-msgstr ""
-
-#: ../../include/features.php:51
-msgid "Web Pages"
-msgstr ""
-
-#: ../../include/features.php:51
-msgid "Provide managed web pages on your channel"
-msgstr ""
-
-#: ../../include/features.php:52
-msgid "Private Notes"
-msgstr ""
-
-#: ../../include/features.php:52
-msgid "Enables a tool to store notes and reminders"
-msgstr ""
-
-#: ../../include/features.php:53
-msgid "Navigation Channel Select"
-msgstr ""
-
-#: ../../include/features.php:53
-msgid "Change channels directly from within the navigation dropdown menu"
-msgstr ""
-
-#: ../../include/features.php:54
-msgid "Photo Location"
-msgstr ""
-
-#: ../../include/features.php:54
-msgid "If location data is available on uploaded photos, link this to a map."
-msgstr ""
-
-#: ../../include/features.php:56
-msgid "Expert Mode"
-msgstr ""
-
-#: ../../include/features.php:56
-msgid "Enable Expert Mode to provide advanced configuration options"
-msgstr ""
-
-#: ../../include/features.php:57
-msgid "Premium Channel"
-msgstr ""
-
-#: ../../include/features.php:57
-msgid ""
-"Allows you to set restrictions and terms on those that connect with your "
-"channel"
-msgstr ""
-
-#: ../../include/features.php:62
-msgid "Post Composition Features"
-msgstr ""
-
-#: ../../include/features.php:64
-msgid "Use Markdown"
-msgstr ""
-
-#: ../../include/features.php:64
-msgid "Allow use of \"Markdown\" to format posts"
-msgstr ""
-
-#: ../../include/features.php:65
-msgid "Large Photos"
-msgstr ""
-
-#: ../../include/features.php:65
-msgid ""
-"Include large (1024px) photo thumbnails in posts. If not enabled, use small "
-"(640px) photo thumbnails"
-msgstr ""
-
-#: ../../include/features.php:66 ../../include/widgets.php:549
-#: ../../mod/sources.php:88
-msgid "Channel Sources"
-msgstr ""
-
-#: ../../include/features.php:66
-msgid "Automatically import channel content from other channels or feeds"
-msgstr ""
-
-#: ../../include/features.php:67
-msgid "Even More Encryption"
-msgstr ""
-
-#: ../../include/features.php:67
-msgid ""
-"Allow optional encryption of content end-to-end with a shared secret key"
-msgstr ""
-
-#: ../../include/features.php:68
-msgid "Enable Voting Tools"
-msgstr ""
-
-#: ../../include/features.php:68
-msgid "Provide a class of post which others can vote on"
-msgstr ""
-
-#: ../../include/features.php:69
-msgid "Delayed Posting"
-msgstr ""
-
-#: ../../include/features.php:69
-msgid "Allow posts to be published at a later date"
-msgstr ""
-
-#: ../../include/features.php:70
-msgid "Suppress Duplicate Posts/Comments"
-msgstr ""
-
-#: ../../include/features.php:70
-msgid ""
-"Prevent posts with identical content to be published with less than two "
-"minutes in between submissions."
-msgstr ""
-
-#: ../../include/features.php:76
-msgid "Network and Stream Filtering"
-msgstr ""
-
-#: ../../include/features.php:77
-msgid "Search by Date"
-msgstr ""
-
-#: ../../include/features.php:77
-msgid "Ability to select posts by date ranges"
-msgstr ""
-
-#: ../../include/features.php:78
-msgid "Collections Filter"
-msgstr ""
-
-#: ../../include/features.php:78
-msgid "Enable widget to display Network posts only from selected collections"
-msgstr ""
-
-#: ../../include/features.php:79 ../../include/widgets.php:274
-msgid "Saved Searches"
-msgstr ""
-
-#: ../../include/features.php:79
-msgid "Save search terms for re-use"
-msgstr ""
-
-#: ../../include/features.php:80
-msgid "Network Personal Tab"
-msgstr ""
-
-#: ../../include/features.php:80
-msgid "Enable tab to display only Network posts that you've interacted on"
-msgstr ""
-
-#: ../../include/features.php:81
-msgid "Network New Tab"
-msgstr ""
-
-#: ../../include/features.php:81
-msgid "Enable tab to display all new Network activity"
-msgstr ""
-
-#: ../../include/features.php:82
-msgid "Affinity Tool"
-msgstr ""
-
-#: ../../include/features.php:82
-msgid "Filter stream activity by depth of relationships"
-msgstr ""
-
-#: ../../include/features.php:83
-msgid "Connection Filtering"
-msgstr ""
-
-#: ../../include/features.php:83
-msgid "Filter incoming posts from connections based on keywords/content"
-msgstr ""
-
-#: ../../include/features.php:84
-msgid "Suggest Channels"
-msgstr ""
-
-#: ../../include/features.php:84
-msgid "Show channel suggestions"
-msgstr ""
-
-#: ../../include/features.php:89
-msgid "Post/Comment Tools"
-msgstr ""
-
-#: ../../include/features.php:90
-msgid "Community Tagging"
-msgstr ""
-
-#: ../../include/features.php:90
-msgid "Ability to tag existing posts"
-msgstr ""
-
-#: ../../include/features.php:91
-msgid "Post Categories"
-msgstr ""
-
-#: ../../include/features.php:91
-msgid "Add categories to your posts"
-msgstr ""
-
-#: ../../include/features.php:92
-msgid "Ability to file posts under folders"
-msgstr ""
-
-#: ../../include/features.php:93
-msgid "Dislike Posts"
-msgstr ""
-
-#: ../../include/features.php:93
-msgid "Ability to dislike posts/comments"
-msgstr ""
-
-#: ../../include/features.php:94
-msgid "Star Posts"
-msgstr ""
-
-#: ../../include/features.php:94
-msgid "Ability to mark special posts with a star indicator"
-msgstr ""
-
-#: ../../include/features.php:95
-msgid "Tag Cloud"
-msgstr ""
-
-#: ../../include/features.php:95
-msgid "Provide a personal tag cloud on your channel page"
-msgstr ""
-
#: ../../include/follow.php:28
msgid "Channel is blocked on this site."
msgstr ""
@@ -2356,7 +1760,7 @@ msgid ""
msgstr ""
#: ../../include/group.php:232
-msgid "Add new connections to this collection (privacy group)"
+msgid "Add new connections to this privacy group"
msgstr ""
#: ../../include/group.php:251 ../../mod/admin.php:900
@@ -2367,277 +1771,26 @@ msgstr ""
msgid "edit"
msgstr ""
-#: ../../include/group.php:295
-msgid "Collections"
+#: ../../include/group.php:295 ../../include/features.php:79
+msgid "Privacy Groups"
msgstr ""
#: ../../include/group.php:296
-msgid "Edit collection"
+msgid "Edit group"
msgstr ""
#: ../../include/group.php:297
-msgid "Add new collection"
+msgid "Add privacy group"
msgstr ""
#: ../../include/group.php:298
-msgid "Channels not in any collection"
+msgid "Channels not in any privacy group"
msgstr ""
#: ../../include/group.php:300 ../../include/widgets.php:275
msgid "add"
msgstr ""
-#: ../../include/identity.php:32
-msgid "Unable to obtain identity information from database"
-msgstr ""
-
-#: ../../include/identity.php:66
-msgid "Empty name"
-msgstr ""
-
-#: ../../include/identity.php:69
-msgid "Name too long"
-msgstr ""
-
-#: ../../include/identity.php:181
-msgid "No account identifier"
-msgstr ""
-
-#: ../../include/identity.php:193
-msgid "Nickname is required."
-msgstr ""
-
-#: ../../include/identity.php:207
-msgid "Reserved nickname. Please choose another."
-msgstr ""
-
-#: ../../include/identity.php:212
-msgid ""
-"Nickname has unsupported characters or is already being used on this site."
-msgstr ""
-
-#: ../../include/identity.php:288
-msgid "Unable to retrieve created identity"
-msgstr ""
-
-#: ../../include/identity.php:346
-msgid "Default Profile"
-msgstr ""
-
-#: ../../include/identity.php:390 ../../include/identity.php:391
-#: ../../include/identity.php:398 ../../include/profile_selectors.php:80
-#: ../../include/widgets.php:430 ../../mod/settings.php:338
-#: ../../mod/settings.php:342 ../../mod/settings.php:343
-#: ../../mod/settings.php:346 ../../mod/settings.php:357
-#: ../../mod/connedit.php:582
-msgid "Friends"
-msgstr ""
-
-#: ../../include/identity.php:770
-msgid "Requested channel is not available."
-msgstr ""
-
-#: ../../include/identity.php:816 ../../mod/achievements.php:11
-#: ../../mod/blocks.php:29 ../../mod/connect.php:13 ../../mod/editblock.php:29
-#: ../../mod/editlayout.php:27 ../../mod/editwebpage.php:28
-#: ../../mod/filestorage.php:54 ../../mod/hcard.php:8 ../../mod/layouts.php:29
-#: ../../mod/profile.php:16 ../../mod/webpages.php:29
-msgid "Requested profile is not available."
-msgstr ""
-
-#: ../../include/identity.php:960 ../../mod/profiles.php:782
-msgid "Change profile photo"
-msgstr ""
-
-#: ../../include/identity.php:966
-msgid "Profiles"
-msgstr ""
-
-#: ../../include/identity.php:966
-msgid "Manage/edit profiles"
-msgstr ""
-
-#: ../../include/identity.php:967 ../../mod/profiles.php:783
-msgid "Create New Profile"
-msgstr ""
-
-#: ../../include/identity.php:970 ../../include/nav.php:90
-msgid "Edit Profile"
-msgstr ""
-
-#: ../../include/identity.php:982 ../../mod/profiles.php:794
-msgid "Profile Image"
-msgstr ""
-
-#: ../../include/identity.php:985
-msgid "visible to everybody"
-msgstr ""
-
-#: ../../include/identity.php:986 ../../mod/profiles.php:677
-#: ../../mod/profiles.php:798
-msgid "Edit visibility"
-msgstr ""
-
-#: ../../include/identity.php:1002 ../../include/identity.php:1242
-msgid "Gender:"
-msgstr ""
-
-#: ../../include/identity.php:1003 ../../include/identity.php:1286
-msgid "Status:"
-msgstr ""
-
-#: ../../include/identity.php:1004 ../../include/identity.php:1297
-msgid "Homepage:"
-msgstr ""
-
-#: ../../include/identity.php:1005
-msgid "Online Now"
-msgstr ""
-
-#: ../../include/identity.php:1089 ../../include/identity.php:1167
-#: ../../mod/ping.php:318
-msgid "g A l F d"
-msgstr ""
-
-#: ../../include/identity.php:1090 ../../include/identity.php:1168
-msgid "F d"
-msgstr ""
-
-#: ../../include/identity.php:1135 ../../include/identity.php:1207
-#: ../../mod/ping.php:341
-msgid "[today]"
-msgstr ""
-
-#: ../../include/identity.php:1146
-msgid "Birthday Reminders"
-msgstr ""
-
-#: ../../include/identity.php:1147
-msgid "Birthdays this week:"
-msgstr ""
-
-#: ../../include/identity.php:1200
-msgid "[No description]"
-msgstr ""
-
-#: ../../include/identity.php:1218
-msgid "Event Reminders"
-msgstr ""
-
-#: ../../include/identity.php:1219
-msgid "Events this week:"
-msgstr ""
-
-#: ../../include/identity.php:1240 ../../mod/settings.php:1029
-msgid "Full Name:"
-msgstr ""
-
-#: ../../include/identity.php:1247
-msgid "Like this channel"
-msgstr ""
-
-#: ../../include/identity.php:1271
-msgid "j F, Y"
-msgstr ""
-
-#: ../../include/identity.php:1272
-msgid "j F"
-msgstr ""
-
-#: ../../include/identity.php:1279
-msgid "Birthday:"
-msgstr ""
-
-#: ../../include/identity.php:1283 ../../mod/directory.php:299
-msgid "Age:"
-msgstr ""
-
-#: ../../include/identity.php:1292
-#, php-format
-msgid "for %1$d %2$s"
-msgstr ""
-
-#: ../../include/identity.php:1295 ../../mod/profiles.php:699
-msgid "Sexual Preference:"
-msgstr ""
-
-#: ../../include/identity.php:1299 ../../mod/directory.php:315
-#: ../../mod/profiles.php:701
-msgid "Hometown:"
-msgstr ""
-
-#: ../../include/identity.php:1301
-msgid "Tags:"
-msgstr ""
-
-#: ../../include/identity.php:1303 ../../mod/profiles.php:702
-msgid "Political Views:"
-msgstr ""
-
-#: ../../include/identity.php:1305
-msgid "Religion:"
-msgstr ""
-
-#: ../../include/identity.php:1307 ../../mod/directory.php:317
-msgid "About:"
-msgstr ""
-
-#: ../../include/identity.php:1309
-msgid "Hobbies/Interests:"
-msgstr ""
-
-#: ../../include/identity.php:1311 ../../mod/profiles.php:705
-msgid "Likes:"
-msgstr ""
-
-#: ../../include/identity.php:1313 ../../mod/profiles.php:706
-msgid "Dislikes:"
-msgstr ""
-
-#: ../../include/identity.php:1315
-msgid "Contact information and Social Networks:"
-msgstr ""
-
-#: ../../include/identity.php:1317
-msgid "My other channels:"
-msgstr ""
-
-#: ../../include/identity.php:1319
-msgid "Musical interests:"
-msgstr ""
-
-#: ../../include/identity.php:1321
-msgid "Books, literature:"
-msgstr ""
-
-#: ../../include/identity.php:1323
-msgid "Television:"
-msgstr ""
-
-#: ../../include/identity.php:1325
-msgid "Film/dance/culture/entertainment:"
-msgstr ""
-
-#: ../../include/identity.php:1327
-msgid "Love/Romance:"
-msgstr ""
-
-#: ../../include/identity.php:1329
-msgid "Work/employment:"
-msgstr ""
-
-#: ../../include/identity.php:1331
-msgid "School/education:"
-msgstr ""
-
-#: ../../include/identity.php:1351
-msgid "Like this thing"
-msgstr ""
-
-#: ../../include/identity.php:1759 ../../mod/cover_photo.php:236
-msgid "cover photo"
-msgstr ""
-
#: ../../include/import.php:23
msgid ""
"Cannot create a duplicate channel identifier on this system. Import failed."
@@ -2651,79 +1804,6 @@ msgstr ""
msgid "Cloned channel not found. Import failed."
msgstr ""
-#: ../../include/items.php:423 ../../index.php:366 ../../mod/dreport.php:6
-#: ../../mod/dreport.php:45 ../../mod/group.php:68
-#: ../../mod/import_items.php:114 ../../mod/like.php:280
-#: ../../mod/profperm.php:23 ../../mod/subthread.php:58
-msgid "Permission denied"
-msgstr ""
-
-#: ../../include/items.php:1130 ../../include/items.php:1176
-msgid "(Unknown)"
-msgstr ""
-
-#: ../../include/items.php:1373
-msgid "Visible to anybody on the internet."
-msgstr ""
-
-#: ../../include/items.php:1375
-msgid "Visible to you only."
-msgstr ""
-
-#: ../../include/items.php:1377
-msgid "Visible to anybody in this network."
-msgstr ""
-
-#: ../../include/items.php:1379
-msgid "Visible to anybody authenticated."
-msgstr ""
-
-#: ../../include/items.php:1381
-#, php-format
-msgid "Visible to anybody on %s."
-msgstr ""
-
-#: ../../include/items.php:1383
-msgid "Visible to all connections."
-msgstr ""
-
-#: ../../include/items.php:1385
-msgid "Visible to approved connections."
-msgstr ""
-
-#: ../../include/items.php:1387
-msgid "Visible to specific connections."
-msgstr ""
-
-#: ../../include/items.php:4326 ../../mod/admin.php:135
-#: ../../mod/admin.php:1091 ../../mod/admin.php:1336 ../../mod/display.php:36
-#: ../../mod/filestorage.php:27 ../../mod/thing.php:86
-#: ../../mod/viewsrc.php:20
-msgid "Item not found."
-msgstr ""
-
-#: ../../include/items.php:4838 ../../mod/group.php:38 ../../mod/group.php:137
-msgid "Collection not found."
-msgstr ""
-
-#: ../../include/items.php:4854
-msgid "Collection is empty."
-msgstr ""
-
-#: ../../include/items.php:4861
-#, php-format
-msgid "Collection: %s"
-msgstr ""
-
-#: ../../include/items.php:4871 ../../mod/connedit.php:692
-#, php-format
-msgid "Connection: %s"
-msgstr ""
-
-#: ../../include/items.php:4873
-msgid "Connection not found."
-msgstr ""
-
#: ../../include/js_strings.php:5
msgid "Delete this item?"
msgstr ""
@@ -2776,8 +1856,8 @@ msgstr ""
msgid "Rate This Channel (this is public)"
msgstr ""
-#: ../../include/js_strings.php:20 ../../mod/rate.php:157
-#: ../../mod/connedit.php:703
+#: ../../include/js_strings.php:20 ../../mod/connedit.php:703
+#: ../../mod/rate.php:157
msgid "Rating"
msgstr ""
@@ -3066,6 +2146,10 @@ msgstr ""
msgid "Stored post could not be verified."
msgstr ""
+#: ../../include/nav.php:82 ../../include/nav.php:114 ../../boot.php:1516
+msgid "Logout"
+msgstr ""
+
#: ../../include/nav.php:82 ../../include/nav.php:114
msgid "End this session"
msgstr ""
@@ -3090,6 +2174,10 @@ msgstr ""
msgid "Manage/Edit profiles"
msgstr ""
+#: ../../include/nav.php:90 ../../include/identity.php:972
+msgid "Edit Profile"
+msgstr ""
+
#: ../../include/nav.php:90
msgid "Edit your profile"
msgstr ""
@@ -3135,6 +2223,10 @@ msgstr ""
msgid "Home Page"
msgstr ""
+#: ../../include/nav.php:149 ../../mod/register.php:264 ../../boot.php:1499
+msgid "Register"
+msgstr ""
+
#: ../../include/nav.php:149
msgid "Create an account"
msgstr ""
@@ -3176,7 +2268,8 @@ msgstr ""
msgid "Mark all channel notifications seen"
msgstr ""
-#: ../../include/nav.php:181 ../../mod/connections.php:293
+#: ../../include/nav.php:181 ../../include/text.php:815
+#: ../../mod/connections.php:298
msgid "Connections"
msgstr ""
@@ -3240,7 +2333,7 @@ msgstr ""
msgid "Account/Channel Settings"
msgstr ""
-#: ../../include/nav.php:210 ../../include/widgets.php:1279
+#: ../../include/nav.php:210 ../../include/widgets.php:1289
msgid "Admin"
msgstr ""
@@ -3260,7 +2353,24 @@ msgstr ""
msgid "view full size"
msgstr ""
-#: ../../include/network.php:1673
+#: ../../include/network.php:1612 ../../include/enotify.php:57
+msgid "$Projectname Notification"
+msgstr ""
+
+#: ../../include/network.php:1613 ../../include/enotify.php:58
+msgid "$projectname"
+msgstr ""
+
+#: ../../include/network.php:1615 ../../include/enotify.php:60
+msgid "Thank You,"
+msgstr ""
+
+#: ../../include/network.php:1617 ../../include/enotify.php:62
+#, php-format
+msgid "%s Administrator"
+msgstr ""
+
+#: ../../include/network.php:1674
msgid "No Subject"
msgstr ""
@@ -3625,6 +2735,15 @@ msgstr ""
msgid "Sex Addict"
msgstr ""
+#: ../../include/profile_selectors.php:80 ../../include/identity.php:390
+#: ../../include/identity.php:391 ../../include/identity.php:398
+#: ../../include/widgets.php:430 ../../mod/connedit.php:582
+#: ../../mod/settings.php:338 ../../mod/settings.php:342
+#: ../../mod/settings.php:343 ../../mod/settings.php:346
+#: ../../mod/settings.php:357
+msgid "Friends"
+msgstr ""
+
#: ../../include/profile_selectors.php:80
msgid "Friends/Benefits"
msgstr ""
@@ -3715,7 +2834,7 @@ msgstr ""
msgid "Ask me"
msgstr ""
-#: ../../include/security.php:381
+#: ../../include/security.php:384
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."
@@ -3753,6 +2872,601 @@ msgstr ""
msgid "dislikes"
msgstr ""
+#: ../../include/zot.php:676
+msgid "Invalid data packet"
+msgstr ""
+
+#: ../../include/zot.php:692
+msgid "Unable to verify channel signature"
+msgstr ""
+
+#: ../../include/zot.php:2268
+#, php-format
+msgid "Unable to verify site signature for %s"
+msgstr ""
+
+#: ../../include/zot.php:3585
+msgid "invalid target signature"
+msgstr ""
+
+#: ../../include/contact_selectors.php:56
+msgid "Frequently"
+msgstr ""
+
+#: ../../include/contact_selectors.php:57
+msgid "Hourly"
+msgstr ""
+
+#: ../../include/contact_selectors.php:58
+msgid "Twice daily"
+msgstr ""
+
+#: ../../include/contact_selectors.php:59
+msgid "Daily"
+msgstr ""
+
+#: ../../include/contact_selectors.php:60
+msgid "Weekly"
+msgstr ""
+
+#: ../../include/contact_selectors.php:61
+msgid "Monthly"
+msgstr ""
+
+#: ../../include/contact_selectors.php:76
+msgid "Friendica"
+msgstr ""
+
+#: ../../include/contact_selectors.php:77
+msgid "OStatus"
+msgstr ""
+
+#: ../../include/contact_selectors.php:78
+msgid "RSS/Atom"
+msgstr ""
+
+#: ../../include/contact_selectors.php:79 ../../mod/admin.php:891
+#: ../../mod/admin.php:900 ../../mod/id.php:15 ../../mod/id.php:16
+#: ../../boot.php:1519
+msgid "Email"
+msgstr ""
+
+#: ../../include/contact_selectors.php:80
+msgid "Diaspora"
+msgstr ""
+
+#: ../../include/contact_selectors.php:81
+msgid "Facebook"
+msgstr ""
+
+#: ../../include/contact_selectors.php:82
+msgid "Zot"
+msgstr ""
+
+#: ../../include/contact_selectors.php:83
+msgid "LinkedIn"
+msgstr ""
+
+#: ../../include/contact_selectors.php:84
+msgid "XMPP/IM"
+msgstr ""
+
+#: ../../include/contact_selectors.php:85
+msgid "MySpace"
+msgstr ""
+
+#: ../../include/features.php:45
+msgid "General Features"
+msgstr ""
+
+#: ../../include/features.php:47
+msgid "Content Expiration"
+msgstr ""
+
+#: ../../include/features.php:47
+msgid "Remove posts/comments and/or private messages at a future time"
+msgstr ""
+
+#: ../../include/features.php:48
+msgid "Multiple Profiles"
+msgstr ""
+
+#: ../../include/features.php:48
+msgid "Ability to create multiple profiles"
+msgstr ""
+
+#: ../../include/features.php:49
+msgid "Advanced Profiles"
+msgstr ""
+
+#: ../../include/features.php:49
+msgid "Additional profile sections and selections"
+msgstr ""
+
+#: ../../include/features.php:50
+msgid "Profile Import/Export"
+msgstr ""
+
+#: ../../include/features.php:50
+msgid "Save and load profile details across sites/channels"
+msgstr ""
+
+#: ../../include/features.php:51
+msgid "Web Pages"
+msgstr ""
+
+#: ../../include/features.php:51
+msgid "Provide managed web pages on your channel"
+msgstr ""
+
+#: ../../include/features.php:52
+msgid "Hide Rating"
+msgstr ""
+
+#: ../../include/features.php:52
+msgid ""
+"Hide the rating buttons on your channel and profile pages. Note: People can "
+"still rate you somewhere else."
+msgstr ""
+
+#: ../../include/features.php:53
+msgid "Private Notes"
+msgstr ""
+
+#: ../../include/features.php:53
+msgid "Enables a tool to store notes and reminders"
+msgstr ""
+
+#: ../../include/features.php:54
+msgid "Navigation Channel Select"
+msgstr ""
+
+#: ../../include/features.php:54
+msgid "Change channels directly from within the navigation dropdown menu"
+msgstr ""
+
+#: ../../include/features.php:55
+msgid "Photo Location"
+msgstr ""
+
+#: ../../include/features.php:55
+msgid "If location data is available on uploaded photos, link this to a map."
+msgstr ""
+
+#: ../../include/features.php:57
+msgid "Expert Mode"
+msgstr ""
+
+#: ../../include/features.php:57
+msgid "Enable Expert Mode to provide advanced configuration options"
+msgstr ""
+
+#: ../../include/features.php:58
+msgid "Premium Channel"
+msgstr ""
+
+#: ../../include/features.php:58
+msgid ""
+"Allows you to set restrictions and terms on those that connect with your "
+"channel"
+msgstr ""
+
+#: ../../include/features.php:63
+msgid "Post Composition Features"
+msgstr ""
+
+#: ../../include/features.php:65
+msgid "Use Markdown"
+msgstr ""
+
+#: ../../include/features.php:65
+msgid "Allow use of \"Markdown\" to format posts"
+msgstr ""
+
+#: ../../include/features.php:66
+msgid "Large Photos"
+msgstr ""
+
+#: ../../include/features.php:66
+msgid ""
+"Include large (1024px) photo thumbnails in posts. If not enabled, use small "
+"(640px) photo thumbnails"
+msgstr ""
+
+#: ../../include/features.php:67 ../../include/widgets.php:549
+#: ../../mod/sources.php:88
+msgid "Channel Sources"
+msgstr ""
+
+#: ../../include/features.php:67
+msgid "Automatically import channel content from other channels or feeds"
+msgstr ""
+
+#: ../../include/features.php:68
+msgid "Even More Encryption"
+msgstr ""
+
+#: ../../include/features.php:68
+msgid ""
+"Allow optional encryption of content end-to-end with a shared secret key"
+msgstr ""
+
+#: ../../include/features.php:69
+msgid "Enable Voting Tools"
+msgstr ""
+
+#: ../../include/features.php:69
+msgid "Provide a class of post which others can vote on"
+msgstr ""
+
+#: ../../include/features.php:70
+msgid "Delayed Posting"
+msgstr ""
+
+#: ../../include/features.php:70
+msgid "Allow posts to be published at a later date"
+msgstr ""
+
+#: ../../include/features.php:71
+msgid "Suppress Duplicate Posts/Comments"
+msgstr ""
+
+#: ../../include/features.php:71
+msgid ""
+"Prevent posts with identical content to be published with less than two "
+"minutes in between submissions."
+msgstr ""
+
+#: ../../include/features.php:77
+msgid "Network and Stream Filtering"
+msgstr ""
+
+#: ../../include/features.php:78
+msgid "Search by Date"
+msgstr ""
+
+#: ../../include/features.php:78
+msgid "Ability to select posts by date ranges"
+msgstr ""
+
+#: ../../include/features.php:79
+msgid "Enable management and selection of privacy groups"
+msgstr ""
+
+#: ../../include/features.php:80 ../../include/widgets.php:274
+msgid "Saved Searches"
+msgstr ""
+
+#: ../../include/features.php:80
+msgid "Save search terms for re-use"
+msgstr ""
+
+#: ../../include/features.php:81
+msgid "Network Personal Tab"
+msgstr ""
+
+#: ../../include/features.php:81
+msgid "Enable tab to display only Network posts that you've interacted on"
+msgstr ""
+
+#: ../../include/features.php:82
+msgid "Network New Tab"
+msgstr ""
+
+#: ../../include/features.php:82
+msgid "Enable tab to display all new Network activity"
+msgstr ""
+
+#: ../../include/features.php:83
+msgid "Affinity Tool"
+msgstr ""
+
+#: ../../include/features.php:83
+msgid "Filter stream activity by depth of relationships"
+msgstr ""
+
+#: ../../include/features.php:84
+msgid "Connection Filtering"
+msgstr ""
+
+#: ../../include/features.php:84
+msgid "Filter incoming posts from connections based on keywords/content"
+msgstr ""
+
+#: ../../include/features.php:85
+msgid "Suggest Channels"
+msgstr ""
+
+#: ../../include/features.php:85
+msgid "Show channel suggestions"
+msgstr ""
+
+#: ../../include/features.php:90
+msgid "Post/Comment Tools"
+msgstr ""
+
+#: ../../include/features.php:91
+msgid "Community Tagging"
+msgstr ""
+
+#: ../../include/features.php:91
+msgid "Ability to tag existing posts"
+msgstr ""
+
+#: ../../include/features.php:92
+msgid "Post Categories"
+msgstr ""
+
+#: ../../include/features.php:92
+msgid "Add categories to your posts"
+msgstr ""
+
+#: ../../include/features.php:93
+msgid "Ability to file posts under folders"
+msgstr ""
+
+#: ../../include/features.php:94
+msgid "Dislike Posts"
+msgstr ""
+
+#: ../../include/features.php:94
+msgid "Ability to dislike posts/comments"
+msgstr ""
+
+#: ../../include/features.php:95
+msgid "Star Posts"
+msgstr ""
+
+#: ../../include/features.php:95
+msgid "Ability to mark special posts with a star indicator"
+msgstr ""
+
+#: ../../include/features.php:96
+msgid "Tag Cloud"
+msgstr ""
+
+#: ../../include/features.php:96
+msgid "Provide a personal tag cloud on your channel page"
+msgstr ""
+
+#: ../../include/identity.php:32
+msgid "Unable to obtain identity information from database"
+msgstr ""
+
+#: ../../include/identity.php:66
+msgid "Empty name"
+msgstr ""
+
+#: ../../include/identity.php:69
+msgid "Name too long"
+msgstr ""
+
+#: ../../include/identity.php:181
+msgid "No account identifier"
+msgstr ""
+
+#: ../../include/identity.php:193
+msgid "Nickname is required."
+msgstr ""
+
+#: ../../include/identity.php:207
+msgid "Reserved nickname. Please choose another."
+msgstr ""
+
+#: ../../include/identity.php:212
+msgid ""
+"Nickname has unsupported characters or is already being used on this site."
+msgstr ""
+
+#: ../../include/identity.php:288
+msgid "Unable to retrieve created identity"
+msgstr ""
+
+#: ../../include/identity.php:346
+msgid "Default Profile"
+msgstr ""
+
+#: ../../include/identity.php:772
+msgid "Requested channel is not available."
+msgstr ""
+
+#: ../../include/identity.php:818 ../../mod/achievements.php:11
+#: ../../mod/blocks.php:29 ../../mod/connect.php:13 ../../mod/editblock.php:29
+#: ../../mod/editlayout.php:27 ../../mod/editwebpage.php:28
+#: ../../mod/filestorage.php:54 ../../mod/hcard.php:8 ../../mod/layouts.php:29
+#: ../../mod/profile.php:16 ../../mod/webpages.php:29
+msgid "Requested profile is not available."
+msgstr ""
+
+#: ../../include/identity.php:962 ../../mod/profiles.php:782
+msgid "Change profile photo"
+msgstr ""
+
+#: ../../include/identity.php:968
+msgid "Profiles"
+msgstr ""
+
+#: ../../include/identity.php:968
+msgid "Manage/edit profiles"
+msgstr ""
+
+#: ../../include/identity.php:969 ../../mod/profiles.php:783
+msgid "Create New Profile"
+msgstr ""
+
+#: ../../include/identity.php:984 ../../mod/profiles.php:794
+msgid "Profile Image"
+msgstr ""
+
+#: ../../include/identity.php:987
+msgid "visible to everybody"
+msgstr ""
+
+#: ../../include/identity.php:988 ../../mod/profiles.php:677
+#: ../../mod/profiles.php:798
+msgid "Edit visibility"
+msgstr ""
+
+#: ../../include/identity.php:1004 ../../include/identity.php:1246
+msgid "Gender:"
+msgstr ""
+
+#: ../../include/identity.php:1005 ../../include/identity.php:1290
+msgid "Status:"
+msgstr ""
+
+#: ../../include/identity.php:1006 ../../include/identity.php:1301
+msgid "Homepage:"
+msgstr ""
+
+#: ../../include/identity.php:1007
+msgid "Online Now"
+msgstr ""
+
+#: ../../include/identity.php:1093 ../../include/identity.php:1171
+#: ../../mod/ping.php:318
+msgid "g A l F d"
+msgstr ""
+
+#: ../../include/identity.php:1094 ../../include/identity.php:1172
+msgid "F d"
+msgstr ""
+
+#: ../../include/identity.php:1139 ../../include/identity.php:1211
+#: ../../mod/ping.php:341
+msgid "[today]"
+msgstr ""
+
+#: ../../include/identity.php:1150
+msgid "Birthday Reminders"
+msgstr ""
+
+#: ../../include/identity.php:1151
+msgid "Birthdays this week:"
+msgstr ""
+
+#: ../../include/identity.php:1204
+msgid "[No description]"
+msgstr ""
+
+#: ../../include/identity.php:1222
+msgid "Event Reminders"
+msgstr ""
+
+#: ../../include/identity.php:1223
+msgid "Events this week:"
+msgstr ""
+
+#: ../../include/identity.php:1244 ../../mod/settings.php:1030
+msgid "Full Name:"
+msgstr ""
+
+#: ../../include/identity.php:1251
+msgid "Like this channel"
+msgstr ""
+
+#: ../../include/identity.php:1275
+msgid "j F, Y"
+msgstr ""
+
+#: ../../include/identity.php:1276
+msgid "j F"
+msgstr ""
+
+#: ../../include/identity.php:1283
+msgid "Birthday:"
+msgstr ""
+
+#: ../../include/identity.php:1287 ../../mod/directory.php:302
+msgid "Age:"
+msgstr ""
+
+#: ../../include/identity.php:1296
+#, php-format
+msgid "for %1$d %2$s"
+msgstr ""
+
+#: ../../include/identity.php:1299 ../../mod/profiles.php:699
+msgid "Sexual Preference:"
+msgstr ""
+
+#: ../../include/identity.php:1303 ../../mod/directory.php:318
+#: ../../mod/profiles.php:701
+msgid "Hometown:"
+msgstr ""
+
+#: ../../include/identity.php:1305
+msgid "Tags:"
+msgstr ""
+
+#: ../../include/identity.php:1307 ../../mod/profiles.php:702
+msgid "Political Views:"
+msgstr ""
+
+#: ../../include/identity.php:1309
+msgid "Religion:"
+msgstr ""
+
+#: ../../include/identity.php:1311 ../../mod/directory.php:320
+msgid "About:"
+msgstr ""
+
+#: ../../include/identity.php:1313
+msgid "Hobbies/Interests:"
+msgstr ""
+
+#: ../../include/identity.php:1315 ../../mod/profiles.php:705
+msgid "Likes:"
+msgstr ""
+
+#: ../../include/identity.php:1317 ../../mod/profiles.php:706
+msgid "Dislikes:"
+msgstr ""
+
+#: ../../include/identity.php:1319
+msgid "Contact information and Social Networks:"
+msgstr ""
+
+#: ../../include/identity.php:1321
+msgid "My other channels:"
+msgstr ""
+
+#: ../../include/identity.php:1323
+msgid "Musical interests:"
+msgstr ""
+
+#: ../../include/identity.php:1325
+msgid "Books, literature:"
+msgstr ""
+
+#: ../../include/identity.php:1327
+msgid "Television:"
+msgstr ""
+
+#: ../../include/identity.php:1329
+msgid "Film/dance/culture/entertainment:"
+msgstr ""
+
+#: ../../include/identity.php:1331
+msgid "Love/Romance:"
+msgstr ""
+
+#: ../../include/identity.php:1333
+msgid "Work/employment:"
+msgstr ""
+
+#: ../../include/identity.php:1335
+msgid "School/education:"
+msgstr ""
+
+#: ../../include/identity.php:1355
+msgid "Like this thing"
+msgstr ""
+
+#: ../../include/identity.php:1763 ../../mod/cover_photo.php:236
+msgid "cover photo"
+msgstr ""
+
#: ../../include/text.php:394
msgid "prev"
msgstr ""
@@ -3781,15 +3495,9 @@ msgstr ""
msgid "No connections"
msgstr ""
-#: ../../include/text.php:815
+#: ../../include/text.php:828
#, php-format
-msgid "%d Connection"
-msgid_plural "%d Connections"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../include/text.php:828 ../../mod/viewconnections.php:101
-msgid "View Connections"
+msgid "View all %s connections"
msgstr ""
#: ../../include/text.php:886 ../../include/text.php:898
@@ -3999,23 +3707,6 @@ msgstr ""
msgid "Pages"
msgstr ""
-#: ../../include/zot.php:676
-msgid "Invalid data packet"
-msgstr ""
-
-#: ../../include/zot.php:692
-msgid "Unable to verify channel signature"
-msgstr ""
-
-#: ../../include/zot.php:2268
-#, php-format
-msgid "Unable to verify site signature for %s"
-msgstr ""
-
-#: ../../include/zot.php:3584
-msgid "invalid target signature"
-msgstr ""
-
#: ../../include/widgets.php:93
msgid "System"
msgstr ""
@@ -4202,111 +3893,366 @@ msgstr ""
msgid "Suggested Chatrooms"
msgstr ""
-#: ../../include/widgets.php:931 ../../include/widgets.php:1021
+#: ../../include/widgets.php:939 ../../include/widgets.php:1029
msgid "photo/image"
msgstr ""
-#: ../../include/widgets.php:1116 ../../include/widgets.php:1118
+#: ../../include/widgets.php:1123
+msgid "Rating Tools"
+msgstr ""
+
+#: ../../include/widgets.php:1127 ../../include/widgets.php:1129
msgid "Rate Me"
msgstr ""
-#: ../../include/widgets.php:1122
+#: ../../include/widgets.php:1132
msgid "View Ratings"
msgstr ""
-#: ../../include/widgets.php:1133
+#: ../../include/widgets.php:1143
msgid "Public Hubs"
msgstr ""
-#: ../../include/widgets.php:1181
+#: ../../include/widgets.php:1191
msgid "Forums"
msgstr ""
-#: ../../include/widgets.php:1210
+#: ../../include/widgets.php:1220
msgid "Tasks"
msgstr ""
-#: ../../include/widgets.php:1219
+#: ../../include/widgets.php:1229
msgid "Documentation"
msgstr ""
-#: ../../include/widgets.php:1221
+#: ../../include/widgets.php:1231
msgid "Project/Site Information"
msgstr ""
-#: ../../include/widgets.php:1222
+#: ../../include/widgets.php:1232
msgid "For Members"
msgstr ""
-#: ../../include/widgets.php:1223
+#: ../../include/widgets.php:1233
msgid "For Administrators"
msgstr ""
-#: ../../include/widgets.php:1224
+#: ../../include/widgets.php:1234
msgid "For Developers"
msgstr ""
-#: ../../include/widgets.php:1249 ../../mod/admin.php:452
+#: ../../include/widgets.php:1259 ../../mod/admin.php:452
msgid "Site"
msgstr ""
-#: ../../include/widgets.php:1250
+#: ../../include/widgets.php:1260
msgid "Accounts"
msgstr ""
-#: ../../include/widgets.php:1251 ../../mod/admin.php:1051
+#: ../../include/widgets.php:1261 ../../mod/admin.php:1051
msgid "Channels"
msgstr ""
-#: ../../include/widgets.php:1253 ../../mod/admin.php:1166
+#: ../../include/widgets.php:1263 ../../mod/admin.php:1166
#: ../../mod/admin.php:1227
msgid "Plugins"
msgstr ""
-#: ../../include/widgets.php:1254 ../../mod/admin.php:1388
+#: ../../include/widgets.php:1264 ../../mod/admin.php:1388
#: ../../mod/admin.php:1422
msgid "Themes"
msgstr ""
-#: ../../include/widgets.php:1255
+#: ../../include/widgets.php:1265
msgid "Inspect queue"
msgstr ""
-#: ../../include/widgets.php:1256
+#: ../../include/widgets.php:1266
msgid "Profile Config"
msgstr ""
-#: ../../include/widgets.php:1257
+#: ../../include/widgets.php:1267
msgid "DB updates"
msgstr ""
-#: ../../include/widgets.php:1275 ../../include/widgets.php:1281
+#: ../../include/widgets.php:1285 ../../include/widgets.php:1291
#: ../../mod/admin.php:1507
msgid "Logs"
msgstr ""
-#: ../../include/widgets.php:1280
+#: ../../include/widgets.php:1290
msgid "Plugin Features"
msgstr ""
-#: ../../include/widgets.php:1282
+#: ../../include/widgets.php:1292
msgid "User registrations waiting for confirmation"
msgstr ""
-#: ../../include/widgets.php:1360 ../../mod/photos.php:748
+#: ../../include/widgets.php:1370 ../../mod/photos.php:748
#: ../../mod/photos.php:1283
msgid "View Photo"
msgstr ""
-#: ../../include/widgets.php:1377 ../../mod/photos.php:779
+#: ../../include/widgets.php:1387 ../../mod/photos.php:779
msgid "Edit Album"
msgstr ""
-#: ../../index.php:238 ../../mod/help.php:213
+#: ../../include/items.php:423 ../../index.php:370 ../../mod/dreport.php:6
+#: ../../mod/dreport.php:45 ../../mod/group.php:68
+#: ../../mod/import_items.php:108 ../../mod/like.php:280
+#: ../../mod/profperm.php:23 ../../mod/subthread.php:58
+msgid "Permission denied"
+msgstr ""
+
+#: ../../include/items.php:1130 ../../include/items.php:1176
+msgid "(Unknown)"
+msgstr ""
+
+#: ../../include/items.php:1373
+msgid "Visible to anybody on the internet."
+msgstr ""
+
+#: ../../include/items.php:1375
+msgid "Visible to you only."
+msgstr ""
+
+#: ../../include/items.php:1377
+msgid "Visible to anybody in this network."
+msgstr ""
+
+#: ../../include/items.php:1379
+msgid "Visible to anybody authenticated."
+msgstr ""
+
+#: ../../include/items.php:1381
+#, php-format
+msgid "Visible to anybody on %s."
+msgstr ""
+
+#: ../../include/items.php:1383
+msgid "Visible to all connections."
+msgstr ""
+
+#: ../../include/items.php:1385
+msgid "Visible to approved connections."
+msgstr ""
+
+#: ../../include/items.php:1387
+msgid "Visible to specific connections."
+msgstr ""
+
+#: ../../include/items.php:4350 ../../mod/admin.php:135
+#: ../../mod/admin.php:1091 ../../mod/admin.php:1336 ../../mod/display.php:36
+#: ../../mod/filestorage.php:27 ../../mod/thing.php:85
+#: ../../mod/viewsrc.php:20
+msgid "Item not found."
+msgstr ""
+
+#: ../../include/items.php:4862 ../../mod/group.php:38 ../../mod/group.php:137
+msgid "Privacy group not found."
+msgstr ""
+
+#: ../../include/items.php:4878
+msgid "Privacy group is empty."
+msgstr ""
+
+#: ../../include/items.php:4885
+#, php-format
+msgid "Privacy group: %s"
+msgstr ""
+
+#: ../../include/items.php:4895 ../../mod/connedit.php:692
+#, php-format
+msgid "Connection: %s"
+msgstr ""
+
+#: ../../include/items.php:4897
+msgid "Connection not found."
+msgstr ""
+
+#: ../../include/enotify.php:96
+#, php-format
+msgid "%s <!item_type!>"
+msgstr ""
+
+#: ../../include/enotify.php:100
+#, php-format
+msgid "[Hubzilla:Notify] New mail received at %s"
+msgstr ""
+
+#: ../../include/enotify.php:102
+#, php-format
+msgid "%1$s, %2$s sent you a new private message at %3$s."
+msgstr ""
+
+#: ../../include/enotify.php:103
+#, php-format
+msgid "%1$s sent you %2$s."
+msgstr ""
+
+#: ../../include/enotify.php:103
+msgid "a private message"
+msgstr ""
+
+#: ../../include/enotify.php:104
+#, php-format
+msgid "Please visit %s to view and/or reply to your private messages."
+msgstr ""
+
+#: ../../include/enotify.php:160
+#, php-format
+msgid "%1$s, %2$s commented on [zrl=%3$s]a %4$s[/zrl]"
+msgstr ""
+
+#: ../../include/enotify.php:168
+#, php-format
+msgid "%1$s, %2$s commented on [zrl=%3$s]%4$s's %5$s[/zrl]"
+msgstr ""
+
+#: ../../include/enotify.php:177
+#, php-format
+msgid "%1$s, %2$s commented on [zrl=%3$s]your %4$s[/zrl]"
+msgstr ""
+
+#: ../../include/enotify.php:188
+#, php-format
+msgid "[Hubzilla:Notify] Comment to conversation #%1$d by %2$s"
+msgstr ""
+
+#: ../../include/enotify.php:189
+#, php-format
+msgid "%1$s, %2$s commented on an item/conversation you have been following."
+msgstr ""
+
+#: ../../include/enotify.php:192 ../../include/enotify.php:207
+#: ../../include/enotify.php:233 ../../include/enotify.php:251
+#: ../../include/enotify.php:265
+#, php-format
+msgid "Please visit %s to view and/or reply to the conversation."
+msgstr ""
+
+#: ../../include/enotify.php:198
+#, php-format
+msgid "[Hubzilla:Notify] %s posted to your profile wall"
+msgstr ""
+
+#: ../../include/enotify.php:200
+#, php-format
+msgid "%1$s, %2$s posted to your profile wall at %3$s"
+msgstr ""
+
+#: ../../include/enotify.php:202
+#, php-format
+msgid "%1$s, %2$s posted to [zrl=%3$s]your wall[/zrl]"
+msgstr ""
+
+#: ../../include/enotify.php:226
+#, php-format
+msgid "[Hubzilla:Notify] %s tagged you"
+msgstr ""
+
+#: ../../include/enotify.php:227
+#, php-format
+msgid "%1$s, %2$s tagged you at %3$s"
+msgstr ""
+
+#: ../../include/enotify.php:228
+#, php-format
+msgid "%1$s, %2$s [zrl=%3$s]tagged you[/zrl]."
+msgstr ""
+
+#: ../../include/enotify.php:240
+#, php-format
+msgid "[Hubzilla:Notify] %1$s poked you"
+msgstr ""
+
+#: ../../include/enotify.php:241
+#, php-format
+msgid "%1$s, %2$s poked you at %3$s"
+msgstr ""
+
+#: ../../include/enotify.php:242
+#, php-format
+msgid "%1$s, %2$s [zrl=%2$s]poked you[/zrl]."
+msgstr ""
+
+#: ../../include/enotify.php:258
+#, php-format
+msgid "[Hubzilla:Notify] %s tagged your post"
+msgstr ""
+
+#: ../../include/enotify.php:259
+#, php-format
+msgid "%1$s, %2$s tagged your post at %3$s"
+msgstr ""
+
+#: ../../include/enotify.php:260
+#, php-format
+msgid "%1$s, %2$s tagged [zrl=%3$s]your post[/zrl]"
+msgstr ""
+
+#: ../../include/enotify.php:272
+msgid "[Hubzilla:Notify] Introduction received"
+msgstr ""
+
+#: ../../include/enotify.php:273
+#, php-format
+msgid "%1$s, you've received an new connection request from '%2$s' at %3$s"
+msgstr ""
+
+#: ../../include/enotify.php:274
+#, php-format
+msgid ""
+"%1$s, you've received [zrl=%2$s]a new connection request[/zrl] from %3$s."
+msgstr ""
+
+#: ../../include/enotify.php:278 ../../include/enotify.php:297
+#, php-format
+msgid "You may visit their profile at %s"
+msgstr ""
+
+#: ../../include/enotify.php:280
+#, php-format
+msgid "Please visit %s to approve or reject the connection request."
+msgstr ""
+
+#: ../../include/enotify.php:287
+msgid "[Hubzilla:Notify] Friend suggestion received"
+msgstr ""
+
+#: ../../include/enotify.php:288
+#, php-format
+msgid "%1$s, you've received a friend suggestion from '%2$s' at %3$s"
+msgstr ""
+
+#: ../../include/enotify.php:289
+#, php-format
+msgid ""
+"%1$s, you've received [zrl=%2$s]a friend suggestion[/zrl] for %3$s from %4$s."
+msgstr ""
+
+#: ../../include/enotify.php:295
+msgid "Name:"
+msgstr ""
+
+#: ../../include/enotify.php:296
+msgid "Photo:"
+msgstr ""
+
+#: ../../include/enotify.php:299
+#, php-format
+msgid "Please visit %s to approve or reject the suggestion."
+msgstr ""
+
+#: ../../include/enotify.php:514
+msgid "[Hubzilla:Notify]"
+msgstr ""
+
+#: ../../index.php:242 ../../mod/help.php:213
msgid "Not Found"
msgstr ""
-#: ../../index.php:241 ../../mod/block.php:75 ../../mod/display.php:110
+#: ../../index.php:245 ../../mod/block.php:75 ../../mod/display.php:110
#: ../../mod/help.php:216 ../../mod/page.php:89
msgid "Page not found."
msgstr ""
@@ -4698,7 +4644,7 @@ msgid ""
msgstr ""
#: ../../mod/admin.php:495
-msgid "Expiration period in days for imported (matrix/network) content"
+msgid "Expiration period in days for imported (grid/network) content"
msgstr ""
#: ../../mod/admin.php:495
@@ -4738,7 +4684,7 @@ msgstr ""
msgid "on server"
msgstr ""
-#: ../../mod/admin.php:618 ../../mod/connections.php:267
+#: ../../mod/admin.php:618 ../../mod/connections.php:266
msgid "Status"
msgstr ""
@@ -4867,7 +4813,7 @@ msgstr ""
msgid "No registrations."
msgstr ""
-#: ../../mod/admin.php:893 ../../mod/connedit.php:719
+#: ../../mod/admin.php:893 ../../mod/connections.php:271
msgid "Approve"
msgstr ""
@@ -5395,7 +5341,7 @@ msgid "Only show hidden connections"
msgstr ""
#: ../../mod/connections.php:234
-msgid "Pending"
+msgid "Pending approval"
msgstr ""
#: ../../mod/connections.php:250
@@ -5411,18 +5357,281 @@ msgstr ""
msgid "Delete connection"
msgstr ""
-#: ../../mod/connections.php:269
+#: ../../mod/connections.php:261
+msgid "Channel address"
+msgstr ""
+
+#: ../../mod/connections.php:263
+msgid "Network"
+msgstr ""
+
+#: ../../mod/connections.php:268
msgid "Connected"
msgstr ""
-#: ../../mod/connections.php:298
+#: ../../mod/connections.php:270
+msgid "Approve connection"
+msgstr ""
+
+#: ../../mod/connections.php:272
+msgid "Ignore connection"
+msgstr ""
+
+#: ../../mod/connections.php:273 ../../mod/connedit.php:536
+#: ../../mod/notifications.php:51
+msgid "Ignore"
+msgstr ""
+
+#: ../../mod/connections.php:274
+msgid "Recent activity"
+msgstr ""
+
+#: ../../mod/connections.php:303
msgid "Search your connections"
msgstr ""
-#: ../../mod/connections.php:299
+#: ../../mod/connections.php:304
msgid "Connections search"
msgstr ""
+#: ../../mod/connedit.php:75
+msgid "Could not access contact record."
+msgstr ""
+
+#: ../../mod/connedit.php:99
+msgid "Could not locate selected profile."
+msgstr ""
+
+#: ../../mod/connedit.php:223
+msgid "Connection updated."
+msgstr ""
+
+#: ../../mod/connedit.php:225
+msgid "Failed to update connection record."
+msgstr ""
+
+#: ../../mod/connedit.php:272
+msgid "is now connected to"
+msgstr ""
+
+#: ../../mod/connedit.php:398
+msgid "Could not access address book record."
+msgstr ""
+
+#: ../../mod/connedit.php:412
+msgid "Refresh failed - channel is currently unavailable."
+msgstr ""
+
+#: ../../mod/connedit.php:427 ../../mod/connedit.php:436
+#: ../../mod/connedit.php:445 ../../mod/connedit.php:454
+#: ../../mod/connedit.php:467
+msgid "Unable to set address book parameters."
+msgstr ""
+
+#: ../../mod/connedit.php:491
+msgid "Connection has been removed."
+msgstr ""
+
+#: ../../mod/connedit.php:510
+#, php-format
+msgid "View %s's profile"
+msgstr ""
+
+#: ../../mod/connedit.php:514
+msgid "Refresh Permissions"
+msgstr ""
+
+#: ../../mod/connedit.php:517
+msgid "Fetch updated permissions"
+msgstr ""
+
+#: ../../mod/connedit.php:521
+msgid "Recent Activity"
+msgstr ""
+
+#: ../../mod/connedit.php:524
+msgid "View recent posts and comments"
+msgstr ""
+
+#: ../../mod/connedit.php:531
+msgid "Block (or Unblock) all communications with this connection"
+msgstr ""
+
+#: ../../mod/connedit.php:532
+msgid "This connection is blocked!"
+msgstr ""
+
+#: ../../mod/connedit.php:536
+msgid "Unignore"
+msgstr ""
+
+#: ../../mod/connedit.php:539
+msgid "Ignore (or Unignore) all inbound communications from this connection"
+msgstr ""
+
+#: ../../mod/connedit.php:540
+msgid "This connection is ignored!"
+msgstr ""
+
+#: ../../mod/connedit.php:544
+msgid "Unarchive"
+msgstr ""
+
+#: ../../mod/connedit.php:544
+msgid "Archive"
+msgstr ""
+
+#: ../../mod/connedit.php:547
+msgid ""
+"Archive (or Unarchive) this connection - mark channel dead but keep content"
+msgstr ""
+
+#: ../../mod/connedit.php:548
+msgid "This connection is archived!"
+msgstr ""
+
+#: ../../mod/connedit.php:552
+msgid "Unhide"
+msgstr ""
+
+#: ../../mod/connedit.php:552
+msgid "Hide"
+msgstr ""
+
+#: ../../mod/connedit.php:555
+msgid "Hide or Unhide this connection from your other connections"
+msgstr ""
+
+#: ../../mod/connedit.php:556
+msgid "This connection is hidden!"
+msgstr ""
+
+#: ../../mod/connedit.php:563
+msgid "Delete this connection"
+msgstr ""
+
+#: ../../mod/connedit.php:644
+msgid "Approve this connection"
+msgstr ""
+
+#: ../../mod/connedit.php:644
+msgid "Accept connection to allow communication"
+msgstr ""
+
+#: ../../mod/connedit.php:649
+msgid "Set Affinity"
+msgstr ""
+
+#: ../../mod/connedit.php:652
+msgid "Set Profile"
+msgstr ""
+
+#: ../../mod/connedit.php:655
+msgid "Set Affinity & Profile"
+msgstr ""
+
+#: ../../mod/connedit.php:688
+msgid "none"
+msgstr ""
+
+#: ../../mod/connedit.php:693
+msgid "Apply these permissions automatically"
+msgstr ""
+
+#: ../../mod/connedit.php:695
+msgid "This connection's primary address is"
+msgstr ""
+
+#: ../../mod/connedit.php:696
+msgid "Available locations:"
+msgstr ""
+
+#: ../../mod/connedit.php:700
+msgid ""
+"The permissions indicated on this page will be applied to all new "
+"connections."
+msgstr ""
+
+#: ../../mod/connedit.php:702
+msgid "Slide to adjust your degree of friendship"
+msgstr ""
+
+#: ../../mod/connedit.php:704
+msgid "Slide to adjust your rating"
+msgstr ""
+
+#: ../../mod/connedit.php:705 ../../mod/connedit.php:710
+msgid "Optionally explain your rating"
+msgstr ""
+
+#: ../../mod/connedit.php:707
+msgid "Custom Filter"
+msgstr ""
+
+#: ../../mod/connedit.php:708
+msgid "Only import posts with this text"
+msgstr ""
+
+#: ../../mod/connedit.php:708 ../../mod/connedit.php:709
+msgid ""
+"words one per line or #tags or /patterns/ or lang=xx, leave blank to import "
+"all posts"
+msgstr ""
+
+#: ../../mod/connedit.php:709
+msgid "Do not import posts with this text"
+msgstr ""
+
+#: ../../mod/connedit.php:711
+msgid "This information is public!"
+msgstr ""
+
+#: ../../mod/connedit.php:716
+msgid "Connection Pending Approval"
+msgstr ""
+
+#: ../../mod/connedit.php:719
+msgid "inherited"
+msgstr ""
+
+#: ../../mod/connedit.php:721
+#, php-format
+msgid ""
+"Please choose the profile you would like to display to %s when viewing your "
+"profile securely."
+msgstr ""
+
+#: ../../mod/connedit.php:723
+msgid "Their Settings"
+msgstr ""
+
+#: ../../mod/connedit.php:724
+msgid "My Settings"
+msgstr ""
+
+#: ../../mod/connedit.php:726
+msgid "Individual Permissions"
+msgstr ""
+
+#: ../../mod/connedit.php:727
+msgid ""
+"Some permissions may be inherited from your channel's <a href=\"settings"
+"\"><strong>privacy settings</strong></a>, which have higher priority than "
+"individual settings. You can <strong>not</strong> change those settings here."
+msgstr ""
+
+#: ../../mod/connedit.php:728
+msgid ""
+"Some permissions may be inherited from your channel's <a href=\"settings"
+"\"><strong>privacy settings</strong></a>, which have higher priority than "
+"individual settings. You can change those settings here but they wont have "
+"any impact unless the inherited setting changes."
+msgstr ""
+
+#: ../../mod/connedit.php:729
+msgid "Last update:"
+msgstr ""
+
#: ../../mod/dav.php:121
msgid "$Projectname channel"
msgstr ""
@@ -5433,86 +5642,86 @@ msgstr ""
msgid "Public access denied."
msgstr ""
-#: ../../mod/directory.php:236
+#: ../../mod/directory.php:239
#, php-format
msgid "%d rating"
msgid_plural "%d ratings"
msgstr[0] ""
msgstr[1] ""
-#: ../../mod/directory.php:247
+#: ../../mod/directory.php:250
msgid "Gender: "
msgstr ""
-#: ../../mod/directory.php:249
+#: ../../mod/directory.php:252
msgid "Status: "
msgstr ""
-#: ../../mod/directory.php:251
+#: ../../mod/directory.php:254
msgid "Homepage: "
msgstr ""
-#: ../../mod/directory.php:310
+#: ../../mod/directory.php:313
msgid "Description:"
msgstr ""
-#: ../../mod/directory.php:319
+#: ../../mod/directory.php:322
msgid "Public Forum:"
msgstr ""
-#: ../../mod/directory.php:322
+#: ../../mod/directory.php:325
msgid "Keywords: "
msgstr ""
-#: ../../mod/directory.php:325
+#: ../../mod/directory.php:328
msgid "Don't suggest"
msgstr ""
-#: ../../mod/directory.php:327
+#: ../../mod/directory.php:330
msgid "Common connections:"
msgstr ""
-#: ../../mod/directory.php:376
+#: ../../mod/directory.php:379
msgid "Global Directory"
msgstr ""
-#: ../../mod/directory.php:376
+#: ../../mod/directory.php:379
msgid "Local Directory"
msgstr ""
-#: ../../mod/directory.php:382
+#: ../../mod/directory.php:385
msgid "Finding:"
msgstr ""
-#: ../../mod/directory.php:387
+#: ../../mod/directory.php:390
msgid "next page"
msgstr ""
-#: ../../mod/directory.php:387
+#: ../../mod/directory.php:390
msgid "previous page"
msgstr ""
-#: ../../mod/directory.php:388
+#: ../../mod/directory.php:391
msgid "Sort options"
msgstr ""
-#: ../../mod/directory.php:389
+#: ../../mod/directory.php:392
msgid "Alphabetic"
msgstr ""
-#: ../../mod/directory.php:390
+#: ../../mod/directory.php:393
msgid "Reverse Alphabetic"
msgstr ""
-#: ../../mod/directory.php:391
+#: ../../mod/directory.php:394
msgid "Newest to Oldest"
msgstr ""
-#: ../../mod/directory.php:392
+#: ../../mod/directory.php:395
msgid "Oldest to Newest"
msgstr ""
-#: ../../mod/directory.php:409
+#: ../../mod/directory.php:412
msgid "No entries (some entries may be hidden)."
msgstr ""
@@ -5864,23 +6073,23 @@ msgid "Suggest a friend for %s"
msgstr ""
#: ../../mod/group.php:20
-msgid "Collection created."
+msgid "Privacy group created."
msgstr ""
#: ../../mod/group.php:26
-msgid "Could not create collection."
+msgid "Could not create privacy group."
msgstr ""
#: ../../mod/group.php:54
-msgid "Collection updated."
+msgid "Privacy group updated."
msgstr ""
#: ../../mod/group.php:86
-msgid "Create a collection of channels."
+msgid "Create a group of channels."
msgstr ""
#: ../../mod/group.php:87 ../../mod/group.php:180
-msgid "Collection Name: "
+msgid "Privacy group name: "
msgstr ""
#: ../../mod/group.php:89 ../../mod/group.php:183
@@ -5888,15 +6097,15 @@ msgid "Members are visible to other channels"
msgstr ""
#: ../../mod/group.php:107
-msgid "Collection removed."
+msgid "Privacy group removed."
msgstr ""
#: ../../mod/group.php:109
-msgid "Unable to remove collection."
+msgid "Unable to remove privacy group."
msgstr ""
#: ../../mod/group.php:179
-msgid "Collection Editor"
+msgid "Privacy group editor"
msgstr ""
#: ../../mod/group.php:193
@@ -5919,7 +6128,7 @@ msgstr ""
msgid "Help:"
msgstr ""
-#: ../../mod/help.php:237
+#: ../../mod/help.php:239
msgid "$Projectname Documentation"
msgstr ""
@@ -6051,7 +6260,7 @@ msgid ""
"provide an export file."
msgstr ""
-#: ../../mod/import.php:516 ../../mod/import_items.php:121
+#: ../../mod/import.php:516 ../../mod/import_items.php:115
msgid "File to Upload"
msgstr ""
@@ -6094,15 +6303,15 @@ msgid ""
"only once and leave this page open until finished."
msgstr ""
-#: ../../mod/import_items.php:101
+#: ../../mod/import_items.php:98
msgid "Import completed"
msgstr ""
-#: ../../mod/import_items.php:119
+#: ../../mod/import_items.php:113
msgid "Import Items"
msgstr ""
-#: ../../mod/import_items.php:120
+#: ../../mod/import_items.php:114
msgid "Use this form to import existing posts and content from an export file."
msgstr ""
@@ -6187,24 +6396,24 @@ msgstr ""
msgid "Executable content type not permitted to this channel."
msgstr ""
-#: ../../mod/item.php:822
+#: ../../mod/item.php:824
msgid "Duplicate post suppressed."
msgstr ""
-#: ../../mod/item.php:953
+#: ../../mod/item.php:954
msgid "System error. Post not saved."
msgstr ""
-#: ../../mod/item.php:1220
+#: ../../mod/item.php:1221
msgid "Unable to obtain post information from database."
msgstr ""
-#: ../../mod/item.php:1227
+#: ../../mod/item.php:1228
#, php-format
msgid "You have reached your limit of %1$.0f top level posts."
msgstr ""
-#: ../../mod/item.php:1234
+#: ../../mod/item.php:1235
#, php-format
msgid "You have reached your limit of %1$.0f webpages."
msgstr ""
@@ -6353,73 +6562,16 @@ msgstr ""
msgid "Use this form to drop the location if the hub is no longer operating."
msgstr ""
-#: ../../mod/lostpass.php:15
-msgid "No valid account found."
-msgstr ""
-
-#: ../../mod/lostpass.php:29
-msgid "Password reset request issued. Check your email."
-msgstr ""
-
-#: ../../mod/lostpass.php:35 ../../mod/lostpass.php:103
-#, php-format
-msgid "Site Member (%s)"
-msgstr ""
-
-#: ../../mod/lostpass.php:40
-#, php-format
-msgid "Password reset requested at %s"
-msgstr ""
-
-#: ../../mod/lostpass.php:63
-msgid ""
-"Request could not be verified. (You may have previously submitted it.) "
-"Password reset failed."
-msgstr ""
-
-#: ../../mod/lostpass.php:87
-msgid "Your password has been reset as requested."
-msgstr ""
-
-#: ../../mod/lostpass.php:88
-msgid "Your new password is"
-msgstr ""
-
-#: ../../mod/lostpass.php:89
-msgid "Save or copy your new password - and then"
-msgstr ""
-
-#: ../../mod/lostpass.php:90
-msgid "click here to login"
-msgstr ""
-
-#: ../../mod/lostpass.php:91
-msgid ""
-"Your password may be changed from the <em>Settings</em> page after "
-"successful login."
-msgstr ""
-
-#: ../../mod/lostpass.php:108
-#, php-format
-msgid "Your password has changed at %s"
-msgstr ""
-
-#: ../../mod/lostpass.php:123
-msgid "Forgot your Password?"
-msgstr ""
-
-#: ../../mod/lostpass.php:124
-msgid ""
-"Enter your email address and submit to have your password reset. Then check "
-"your email for further instructions."
+#: ../../mod/ping.php:260
+msgid "sent you a private message"
msgstr ""
-#: ../../mod/lostpass.php:125
-msgid "Email Address"
+#: ../../mod/ping.php:308
+msgid "added your channel"
msgstr ""
-#: ../../mod/lostpass.php:126
-msgid "Reset"
+#: ../../mod/ping.php:350
+msgid "posted an event"
msgstr ""
#: ../../mod/magic.php:69
@@ -6518,33 +6670,33 @@ msgstr ""
msgid "Create a new channel"
msgstr ""
-#: ../../mod/manage.php:161
+#: ../../mod/manage.php:163
msgid "Current Channel"
msgstr ""
-#: ../../mod/manage.php:163
+#: ../../mod/manage.php:165
msgid "Switch to one of your channels by selecting it."
msgstr ""
-#: ../../mod/manage.php:164
+#: ../../mod/manage.php:166
msgid "Default Channel"
msgstr ""
-#: ../../mod/manage.php:165
+#: ../../mod/manage.php:167
msgid "Make Default"
msgstr ""
-#: ../../mod/manage.php:168
+#: ../../mod/manage.php:170
#, php-format
msgid "%d new messages"
msgstr ""
-#: ../../mod/manage.php:169
+#: ../../mod/manage.php:171
#, php-format
msgid "%d new introductions"
msgstr ""
-#: ../../mod/manage.php:171
+#: ../../mod/manage.php:173
msgid "Delegated Channels"
msgstr ""
@@ -6676,7 +6828,7 @@ msgstr ""
msgid "Menu Item Permissions"
msgstr ""
-#: ../../mod/mitem.php:150 ../../mod/mitem.php:223 ../../mod/settings.php:1056
+#: ../../mod/mitem.php:150 ../../mod/mitem.php:223 ../../mod/settings.php:1057
msgid "(click to open/close)"
msgstr ""
@@ -6797,22 +6949,22 @@ msgid "Search Results For:"
msgstr ""
#: ../../mod/network.php:207
-msgid "Collection is empty"
+msgid "Privacy group is empty"
msgstr ""
#: ../../mod/network.php:216
-msgid "Collection: "
+msgid "Privacy group: "
msgstr ""
#: ../../mod/network.php:242
msgid "Invalid connection."
msgstr ""
-#: ../../mod/new_channel.php:120
+#: ../../mod/new_channel.php:130
msgid "Add a Channel"
msgstr ""
-#: ../../mod/new_channel.php:121
+#: ../../mod/new_channel.php:131
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, "
@@ -6820,43 +6972,43 @@ msgid ""
"service provider allows."
msgstr ""
-#: ../../mod/new_channel.php:123 ../../mod/register.php:246
+#: ../../mod/new_channel.php:133 ../../mod/register.php:246
#: ../../mod/sources.php:103 ../../mod/sources.php:137
msgid "Channel Name"
msgstr ""
-#: ../../mod/new_channel.php:124
+#: ../../mod/new_channel.php:134
msgid ""
"Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation "
"Group\" "
msgstr ""
-#: ../../mod/new_channel.php:125 ../../mod/register.php:248
+#: ../../mod/new_channel.php:135 ../../mod/register.php:248
msgid "Choose a short nickname"
msgstr ""
-#: ../../mod/new_channel.php:126 ../../mod/register.php:249
+#: ../../mod/new_channel.php:137 ../../mod/register.php:249
msgid ""
"Your nickname will be used to create an easily remembered channel address "
"(like an email address) which you can share with others."
msgstr ""
-#: ../../mod/new_channel.php:127
+#: ../../mod/new_channel.php:138
msgid ""
"Or <a href=\"import\">import an existing channel</a> from another location"
msgstr ""
-#: ../../mod/new_channel.php:129 ../../mod/register.php:251
+#: ../../mod/new_channel.php:140 ../../mod/register.php:251
msgid ""
"Please choose a channel type (such as social networking or community forum) "
"and privacy requirements so we can select the best permissions for you"
msgstr ""
-#: ../../mod/new_channel.php:130 ../../mod/register.php:252
+#: ../../mod/new_channel.php:141 ../../mod/register.php:252
msgid "Channel Type"
msgstr ""
-#: ../../mod/new_channel.php:130 ../../mod/register.php:252
+#: ../../mod/new_channel.php:141 ../../mod/register.php:252
msgid "Read more about roles"
msgstr ""
@@ -6868,10 +7020,6 @@ msgstr ""
msgid "Discard"
msgstr ""
-#: ../../mod/notifications.php:51 ../../mod/connedit.php:536
-msgid "Ignore"
-msgstr ""
-
#: ../../mod/notifications.php:94 ../../mod/notify.php:53
msgid "No more system notifications."
msgstr ""
@@ -6917,23 +7065,23 @@ msgid ""
"to correctly use this feature."
msgstr ""
-#: ../../mod/pdledit.php:13
+#: ../../mod/pdledit.php:14
msgid "Layout updated."
msgstr ""
-#: ../../mod/pdledit.php:28 ../../mod/pdledit.php:53
+#: ../../mod/pdledit.php:29 ../../mod/pdledit.php:54
msgid "Edit System Page Description"
msgstr ""
-#: ../../mod/pdledit.php:48
+#: ../../mod/pdledit.php:49
msgid "Layout not found."
msgstr ""
-#: ../../mod/pdledit.php:54
+#: ../../mod/pdledit.php:55
msgid "Module Name:"
msgstr ""
-#: ../../mod/pdledit.php:55
+#: ../../mod/pdledit.php:56
msgid "Layout Help"
msgstr ""
@@ -7089,18 +7237,6 @@ msgstr ""
msgid "Recent Photos"
msgstr ""
-#: ../../mod/ping.php:260
-msgid "sent you a private message"
-msgstr ""
-
-#: ../../mod/ping.php:308
-msgid "added your channel"
-msgstr ""
-
-#: ../../mod/ping.php:350
-msgid "posted an event"
-msgstr ""
-
#: ../../mod/poke.php:164
msgid "Poke/Prod"
msgstr ""
@@ -7192,7 +7328,7 @@ msgstr ""
msgid "Upload Profile Photo"
msgstr ""
-#: ../../mod/profile_photo.php:457 ../../mod/settings.php:975
+#: ../../mod/profile_photo.php:457 ../../mod/settings.php:976
#: ../../mod/cover_photo.php:357
msgid "or"
msgstr ""
@@ -7548,10 +7684,6 @@ msgstr ""
msgid "No ratings"
msgstr ""
-#: ../../mod/ratings.php:99
-msgid "Ratings"
-msgstr ""
-
#: ../../mod/ratings.php:100
msgid "Rating: "
msgstr ""
@@ -7734,7 +7866,7 @@ msgid ""
"removed from the network"
msgstr ""
-#: ../../mod/removeme.php:61 ../../mod/settings.php:1112
+#: ../../mod/removeme.php:61 ../../mod/settings.php:1113
msgid "Remove Channel"
msgstr ""
@@ -7900,7 +8032,7 @@ msgstr ""
msgid "Leave password fields blank unless changing"
msgstr ""
-#: ../../mod/settings.php:699 ../../mod/settings.php:1030
+#: ../../mod/settings.php:699 ../../mod/settings.php:1031
msgid "Email Address:"
msgstr ""
@@ -7990,7 +8122,7 @@ msgid "(comments displayed separately)"
msgstr ""
#: ../../mod/settings.php:849
-msgid "Use blog/list mode on matrix page"
+msgid "Use blog/list mode on grid page"
msgstr ""
#: ../../mod/settings.php:850
@@ -8002,7 +8134,7 @@ msgid "click to expand content exceeding this height"
msgstr ""
#: ../../mod/settings.php:851
-msgid "Matrix page max height of content (in pixels)"
+msgid "Grid page max height of content (in pixels)"
msgstr ""
#: ../../mod/settings.php:885
@@ -8037,305 +8169,306 @@ msgstr ""
msgid "Anybody on the internet"
msgstr ""
-#: ../../mod/settings.php:966
+#: ../../mod/settings.php:967
msgid "Publish your default profile in the network directory"
msgstr ""
-#: ../../mod/settings.php:971
+#: ../../mod/settings.php:972
msgid "Allow us to suggest you as a potential friend to new members?"
msgstr ""
-#: ../../mod/settings.php:980
+#: ../../mod/settings.php:981
msgid "Your channel address is"
msgstr ""
-#: ../../mod/settings.php:1021
+#: ../../mod/settings.php:1022
msgid "Channel Settings"
msgstr ""
-#: ../../mod/settings.php:1028
+#: ../../mod/settings.php:1029
msgid "Basic Settings"
msgstr ""
-#: ../../mod/settings.php:1031
+#: ../../mod/settings.php:1032
msgid "Your Timezone:"
msgstr ""
-#: ../../mod/settings.php:1032
+#: ../../mod/settings.php:1033
msgid "Default Post Location:"
msgstr ""
-#: ../../mod/settings.php:1032
+#: ../../mod/settings.php:1033
msgid "Geographical location to display on your posts"
msgstr ""
-#: ../../mod/settings.php:1033
+#: ../../mod/settings.php:1034
msgid "Use Browser Location:"
msgstr ""
-#: ../../mod/settings.php:1035
+#: ../../mod/settings.php:1036
msgid "Adult Content"
msgstr ""
-#: ../../mod/settings.php:1035
+#: ../../mod/settings.php:1036
msgid ""
"This channel frequently or regularly publishes adult content. (Please tag "
"any adult material and/or nudity with #NSFW)"
msgstr ""
-#: ../../mod/settings.php:1037
+#: ../../mod/settings.php:1038
msgid "Security and Privacy Settings"
msgstr ""
-#: ../../mod/settings.php:1039
+#: ../../mod/settings.php:1040
msgid "Your permissions are already configured. Click to view/adjust"
msgstr ""
-#: ../../mod/settings.php:1041
+#: ../../mod/settings.php:1042
msgid "Hide my online presence"
msgstr ""
-#: ../../mod/settings.php:1041
+#: ../../mod/settings.php:1042
msgid "Prevents displaying in your profile that you are online"
msgstr ""
-#: ../../mod/settings.php:1043
+#: ../../mod/settings.php:1044
msgid "Simple Privacy Settings:"
msgstr ""
-#: ../../mod/settings.php:1044
+#: ../../mod/settings.php:1045
msgid ""
"Very Public - <em>extremely permissive (should be used with caution)</em>"
msgstr ""
-#: ../../mod/settings.php:1045
+#: ../../mod/settings.php:1046
msgid ""
"Typical - <em>default public, privacy when desired (similar to social "
"network permissions but with improved privacy)</em>"
msgstr ""
-#: ../../mod/settings.php:1046
+#: ../../mod/settings.php:1047
msgid "Private - <em>default private, never open or public</em>"
msgstr ""
-#: ../../mod/settings.php:1047
+#: ../../mod/settings.php:1048
msgid "Blocked - <em>default blocked to/from everybody</em>"
msgstr ""
-#: ../../mod/settings.php:1049
+#: ../../mod/settings.php:1050
msgid "Allow others to tag your posts"
msgstr ""
-#: ../../mod/settings.php:1049
+#: ../../mod/settings.php:1050
msgid ""
"Often used by the community to retro-actively flag inappropriate content"
msgstr ""
-#: ../../mod/settings.php:1051
+#: ../../mod/settings.php:1052
msgid "Advanced Privacy Settings"
msgstr ""
-#: ../../mod/settings.php:1053
+#: ../../mod/settings.php:1054
msgid "Expire other channel content after this many days"
msgstr ""
-#: ../../mod/settings.php:1053
-msgid "0 or blank prevents expiration"
+#: ../../mod/settings.php:1054
+#, php-format
+msgid "0 or blank to use the website limit. The website expires after %d days."
msgstr ""
-#: ../../mod/settings.php:1054
+#: ../../mod/settings.php:1055
msgid "Maximum Friend Requests/Day:"
msgstr ""
-#: ../../mod/settings.php:1054
+#: ../../mod/settings.php:1055
msgid "May reduce spam activity"
msgstr ""
-#: ../../mod/settings.php:1055
+#: ../../mod/settings.php:1056
msgid "Default Post Permissions"
msgstr ""
-#: ../../mod/settings.php:1060
+#: ../../mod/settings.php:1061
msgid "Channel permissions category:"
msgstr ""
-#: ../../mod/settings.php:1066
+#: ../../mod/settings.php:1067
msgid "Maximum private messages per day from unknown people:"
msgstr ""
-#: ../../mod/settings.php:1066
+#: ../../mod/settings.php:1067
msgid "Useful to reduce spamming"
msgstr ""
-#: ../../mod/settings.php:1069
+#: ../../mod/settings.php:1070
msgid "Notification Settings"
msgstr ""
-#: ../../mod/settings.php:1070
+#: ../../mod/settings.php:1071
msgid "By default post a status message when:"
msgstr ""
-#: ../../mod/settings.php:1071
+#: ../../mod/settings.php:1072
msgid "accepting a friend request"
msgstr ""
-#: ../../mod/settings.php:1072
+#: ../../mod/settings.php:1073
msgid "joining a forum/community"
msgstr ""
-#: ../../mod/settings.php:1073
+#: ../../mod/settings.php:1074
msgid "making an <em>interesting</em> profile change"
msgstr ""
-#: ../../mod/settings.php:1074
+#: ../../mod/settings.php:1075
msgid "Send a notification email when:"
msgstr ""
-#: ../../mod/settings.php:1075
+#: ../../mod/settings.php:1076
msgid "You receive a connection request"
msgstr ""
-#: ../../mod/settings.php:1076
+#: ../../mod/settings.php:1077
msgid "Your connections are confirmed"
msgstr ""
-#: ../../mod/settings.php:1077
+#: ../../mod/settings.php:1078
msgid "Someone writes on your profile wall"
msgstr ""
-#: ../../mod/settings.php:1078
+#: ../../mod/settings.php:1079
msgid "Someone writes a followup comment"
msgstr ""
-#: ../../mod/settings.php:1079
+#: ../../mod/settings.php:1080
msgid "You receive a private message"
msgstr ""
-#: ../../mod/settings.php:1080
+#: ../../mod/settings.php:1081
msgid "You receive a friend suggestion"
msgstr ""
-#: ../../mod/settings.php:1081
+#: ../../mod/settings.php:1082
msgid "You are tagged in a post"
msgstr ""
-#: ../../mod/settings.php:1082
+#: ../../mod/settings.php:1083
msgid "You are poked/prodded/etc. in a post"
msgstr ""
-#: ../../mod/settings.php:1085
+#: ../../mod/settings.php:1086
msgid "Show visual notifications including:"
msgstr ""
-#: ../../mod/settings.php:1087
-msgid "Unseen matrix activity"
+#: ../../mod/settings.php:1088
+msgid "Unseen grid activity"
msgstr ""
-#: ../../mod/settings.php:1088
+#: ../../mod/settings.php:1089
msgid "Unseen channel activity"
msgstr ""
-#: ../../mod/settings.php:1089
+#: ../../mod/settings.php:1090
msgid "Unseen private messages"
msgstr ""
-#: ../../mod/settings.php:1089 ../../mod/settings.php:1094
-#: ../../mod/settings.php:1095 ../../mod/settings.php:1096
+#: ../../mod/settings.php:1090 ../../mod/settings.php:1095
+#: ../../mod/settings.php:1096 ../../mod/settings.php:1097
msgid "Recommended"
msgstr ""
-#: ../../mod/settings.php:1090
+#: ../../mod/settings.php:1091
msgid "Upcoming events"
msgstr ""
-#: ../../mod/settings.php:1091
+#: ../../mod/settings.php:1092
msgid "Events today"
msgstr ""
-#: ../../mod/settings.php:1092
+#: ../../mod/settings.php:1093
msgid "Upcoming birthdays"
msgstr ""
-#: ../../mod/settings.php:1092
+#: ../../mod/settings.php:1093
msgid "Not available in all themes"
msgstr ""
-#: ../../mod/settings.php:1093
+#: ../../mod/settings.php:1094
msgid "System (personal) notifications"
msgstr ""
-#: ../../mod/settings.php:1094
+#: ../../mod/settings.php:1095
msgid "System info messages"
msgstr ""
-#: ../../mod/settings.php:1095
+#: ../../mod/settings.php:1096
msgid "System critical alerts"
msgstr ""
-#: ../../mod/settings.php:1096
+#: ../../mod/settings.php:1097
msgid "New connections"
msgstr ""
-#: ../../mod/settings.php:1097
+#: ../../mod/settings.php:1098
msgid "System Registrations"
msgstr ""
-#: ../../mod/settings.php:1098
+#: ../../mod/settings.php:1099
msgid ""
"Also show new wall posts, private messages and connections under Notices"
msgstr ""
-#: ../../mod/settings.php:1100
+#: ../../mod/settings.php:1101
msgid "Notify me of events this many days in advance"
msgstr ""
-#: ../../mod/settings.php:1100
+#: ../../mod/settings.php:1101
msgid "Must be greater than 0"
msgstr ""
-#: ../../mod/settings.php:1102
+#: ../../mod/settings.php:1103
msgid "Advanced Account/Page Type Settings"
msgstr ""
-#: ../../mod/settings.php:1103
+#: ../../mod/settings.php:1104
msgid "Change the behaviour of this account for special situations"
msgstr ""
-#: ../../mod/settings.php:1106
+#: ../../mod/settings.php:1107
msgid ""
"Please enable expert mode (in <a href=\"settings/features\">Settings > "
"Additional features</a>) to adjust!"
msgstr ""
-#: ../../mod/settings.php:1107
+#: ../../mod/settings.php:1108
msgid "Miscellaneous Settings"
msgstr ""
-#: ../../mod/settings.php:1108
+#: ../../mod/settings.php:1109
msgid "Default photo upload folder"
msgstr ""
-#: ../../mod/settings.php:1108 ../../mod/settings.php:1109
+#: ../../mod/settings.php:1109 ../../mod/settings.php:1110
msgid "%Y - current year, %m - current month"
msgstr ""
-#: ../../mod/settings.php:1109
+#: ../../mod/settings.php:1110
msgid "Default file upload folder"
msgstr ""
-#: ../../mod/settings.php:1111
+#: ../../mod/settings.php:1112
msgid "Personal menu to display in your channel pages"
msgstr ""
-#: ../../mod/settings.php:1113
+#: ../../mod/settings.php:1114
msgid "Remove this channel."
msgstr ""
-#: ../../mod/settings.php:1114
+#: ../../mod/settings.php:1115
msgid "Firefox Share $Projectname provider"
msgstr ""
-#: ../../mod/settings.php:1115
+#: ../../mod/settings.php:1116
msgid "Start calendar week on monday"
msgstr ""
@@ -8745,257 +8878,77 @@ msgid ""
"IMPORTANT: You will need to [manually] setup a scheduled task for the poller."
msgstr ""
-#: ../../mod/connedit.php:75
-msgid "Could not access contact record."
-msgstr ""
-
-#: ../../mod/connedit.php:99
-msgid "Could not locate selected profile."
-msgstr ""
-
-#: ../../mod/connedit.php:223
-msgid "Connection updated."
-msgstr ""
-
-#: ../../mod/connedit.php:225
-msgid "Failed to update connection record."
-msgstr ""
-
-#: ../../mod/connedit.php:272
-msgid "is now connected to"
-msgstr ""
-
-#: ../../mod/connedit.php:398
-msgid "Could not access address book record."
-msgstr ""
-
-#: ../../mod/connedit.php:412
-msgid "Refresh failed - channel is currently unavailable."
-msgstr ""
-
-#: ../../mod/connedit.php:427 ../../mod/connedit.php:436
-#: ../../mod/connedit.php:445 ../../mod/connedit.php:454
-#: ../../mod/connedit.php:467
-msgid "Unable to set address book parameters."
+#: ../../mod/lostpass.php:15
+msgid "No valid account found."
msgstr ""
-#: ../../mod/connedit.php:491
-msgid "Connection has been removed."
+#: ../../mod/lostpass.php:29
+msgid "Password reset request issued. Check your email."
msgstr ""
-#: ../../mod/connedit.php:510
+#: ../../mod/lostpass.php:35 ../../mod/lostpass.php:103
#, php-format
-msgid "View %s's profile"
-msgstr ""
-
-#: ../../mod/connedit.php:514
-msgid "Refresh Permissions"
-msgstr ""
-
-#: ../../mod/connedit.php:517
-msgid "Fetch updated permissions"
-msgstr ""
-
-#: ../../mod/connedit.php:521
-msgid "Recent Activity"
-msgstr ""
-
-#: ../../mod/connedit.php:524
-msgid "View recent posts and comments"
-msgstr ""
-
-#: ../../mod/connedit.php:531
-msgid "Block (or Unblock) all communications with this connection"
-msgstr ""
-
-#: ../../mod/connedit.php:532
-msgid "This connection is blocked!"
-msgstr ""
-
-#: ../../mod/connedit.php:536
-msgid "Unignore"
-msgstr ""
-
-#: ../../mod/connedit.php:539
-msgid "Ignore (or Unignore) all inbound communications from this connection"
-msgstr ""
-
-#: ../../mod/connedit.php:540
-msgid "This connection is ignored!"
-msgstr ""
-
-#: ../../mod/connedit.php:544
-msgid "Unarchive"
-msgstr ""
-
-#: ../../mod/connedit.php:544
-msgid "Archive"
-msgstr ""
-
-#: ../../mod/connedit.php:547
-msgid ""
-"Archive (or Unarchive) this connection - mark channel dead but keep content"
-msgstr ""
-
-#: ../../mod/connedit.php:548
-msgid "This connection is archived!"
-msgstr ""
-
-#: ../../mod/connedit.php:552
-msgid "Unhide"
-msgstr ""
-
-#: ../../mod/connedit.php:552
-msgid "Hide"
-msgstr ""
-
-#: ../../mod/connedit.php:555
-msgid "Hide or Unhide this connection from your other connections"
-msgstr ""
-
-#: ../../mod/connedit.php:556
-msgid "This connection is hidden!"
-msgstr ""
-
-#: ../../mod/connedit.php:563
-msgid "Delete this connection"
-msgstr ""
-
-#: ../../mod/connedit.php:644
-msgid "Approve this connection"
-msgstr ""
-
-#: ../../mod/connedit.php:644
-msgid "Accept connection to allow communication"
-msgstr ""
-
-#: ../../mod/connedit.php:649
-msgid "Set Affinity"
-msgstr ""
-
-#: ../../mod/connedit.php:652
-msgid "Set Profile"
-msgstr ""
-
-#: ../../mod/connedit.php:655
-msgid "Set Affinity & Profile"
-msgstr ""
-
-#: ../../mod/connedit.php:688
-msgid "none"
-msgstr ""
-
-#: ../../mod/connedit.php:693
-msgid "Apply these permissions automatically"
-msgstr ""
-
-#: ../../mod/connedit.php:695
-msgid "This connection's primary address is"
+msgid "Site Member (%s)"
msgstr ""
-#: ../../mod/connedit.php:696
-msgid "Available locations:"
+#: ../../mod/lostpass.php:40
+#, php-format
+msgid "Password reset requested at %s"
msgstr ""
-#: ../../mod/connedit.php:700
+#: ../../mod/lostpass.php:63
msgid ""
-"The permissions indicated on this page will be applied to all new "
-"connections."
-msgstr ""
-
-#: ../../mod/connedit.php:702
-msgid "Slide to adjust your degree of friendship"
-msgstr ""
-
-#: ../../mod/connedit.php:704
-msgid "Slide to adjust your rating"
-msgstr ""
-
-#: ../../mod/connedit.php:705 ../../mod/connedit.php:710
-msgid "Optionally explain your rating"
-msgstr ""
-
-#: ../../mod/connedit.php:707
-msgid "Custom Filter"
-msgstr ""
-
-#: ../../mod/connedit.php:708
-msgid "Only import posts with this text"
+"Request could not be verified. (You may have previously submitted it.) "
+"Password reset failed."
msgstr ""
-#: ../../mod/connedit.php:708 ../../mod/connedit.php:709
-msgid ""
-"words one per line or #tags or /patterns/ or lang=xx, leave blank to import "
-"all posts"
+#: ../../mod/lostpass.php:86 ../../boot.php:1525
+msgid "Password Reset"
msgstr ""
-#: ../../mod/connedit.php:709
-msgid "Do not import posts with this text"
+#: ../../mod/lostpass.php:87
+msgid "Your password has been reset as requested."
msgstr ""
-#: ../../mod/connedit.php:711
-msgid "This information is public!"
+#: ../../mod/lostpass.php:88
+msgid "Your new password is"
msgstr ""
-#: ../../mod/connedit.php:716
-msgid "Connection Pending Approval"
+#: ../../mod/lostpass.php:89
+msgid "Save or copy your new password - and then"
msgstr ""
-#: ../../mod/connedit.php:717
-msgid "Connection Request"
+#: ../../mod/lostpass.php:90
+msgid "click here to login"
msgstr ""
-#: ../../mod/connedit.php:718
-#, php-format
+#: ../../mod/lostpass.php:91
msgid ""
-"(%s) would like to connect with you. Please approve this connection to allow "
-"communication."
-msgstr ""
-
-#: ../../mod/connedit.php:720
-msgid "Approve Later"
-msgstr ""
-
-#: ../../mod/connedit.php:723
-msgid "inherited"
+"Your password may be changed from the <em>Settings</em> page after "
+"successful login."
msgstr ""
-#: ../../mod/connedit.php:725
+#: ../../mod/lostpass.php:108
#, php-format
-msgid ""
-"Please choose the profile you would like to display to %s when viewing your "
-"profile securely."
-msgstr ""
-
-#: ../../mod/connedit.php:727
-msgid "Their Settings"
-msgstr ""
-
-#: ../../mod/connedit.php:728
-msgid "My Settings"
+msgid "Your password has changed at %s"
msgstr ""
-#: ../../mod/connedit.php:730
-msgid "Individual Permissions"
+#: ../../mod/lostpass.php:123
+msgid "Forgot your Password?"
msgstr ""
-#: ../../mod/connedit.php:731
+#: ../../mod/lostpass.php:124
msgid ""
-"Some permissions may be inherited from your channel's <a href=\"settings"
-"\"><strong>privacy settings</strong></a>, which have higher priority than "
-"individual settings. You can <strong>not</strong> change those settings here."
+"Enter your email address and submit to have your password reset. Then check "
+"your email for further instructions."
msgstr ""
-#: ../../mod/connedit.php:732
-msgid ""
-"Some permissions may be inherited from your channel's <a href=\"settings"
-"\"><strong>privacy settings</strong></a>, which have higher priority than "
-"individual settings. You can change those settings here but they wont have "
-"any impact unless the inherited setting changes."
+#: ../../mod/lostpass.php:125
+msgid "Email Address"
msgstr ""
-#: ../../mod/connedit.php:733
-msgid "Last update:"
+#: ../../mod/lostpass.php:126
+msgid "Reset"
msgstr ""
#: ../../mod/sharedwithme.php:94
@@ -9163,60 +9116,60 @@ msgstr ""
msgid "Select a tag to remove: "
msgstr ""
-#: ../../mod/thing.php:111
+#: ../../mod/thing.php:110
msgid "Thing updated"
msgstr ""
-#: ../../mod/thing.php:163
+#: ../../mod/thing.php:162
msgid "Object store: failed"
msgstr ""
-#: ../../mod/thing.php:167
+#: ../../mod/thing.php:166
msgid "Thing added"
msgstr ""
-#: ../../mod/thing.php:193
+#: ../../mod/thing.php:192
#, php-format
msgid "OBJ: %1$s %2$s %3$s"
msgstr ""
-#: ../../mod/thing.php:256
+#: ../../mod/thing.php:255
msgid "Show Thing"
msgstr ""
-#: ../../mod/thing.php:263
+#: ../../mod/thing.php:262
msgid "item not found."
msgstr ""
-#: ../../mod/thing.php:296
+#: ../../mod/thing.php:295
msgid "Edit Thing"
msgstr ""
-#: ../../mod/thing.php:298 ../../mod/thing.php:348
+#: ../../mod/thing.php:297 ../../mod/thing.php:347
msgid "Select a profile"
msgstr ""
-#: ../../mod/thing.php:302 ../../mod/thing.php:351
+#: ../../mod/thing.php:301 ../../mod/thing.php:350
msgid "Post an activity"
msgstr ""
-#: ../../mod/thing.php:302 ../../mod/thing.php:351
+#: ../../mod/thing.php:301 ../../mod/thing.php:350
msgid "Only sends to viewers of the applicable profile"
msgstr ""
-#: ../../mod/thing.php:304 ../../mod/thing.php:353
+#: ../../mod/thing.php:303 ../../mod/thing.php:352
msgid "Name of thing e.g. something"
msgstr ""
-#: ../../mod/thing.php:306 ../../mod/thing.php:354
+#: ../../mod/thing.php:305 ../../mod/thing.php:353
msgid "URL of thing (optional)"
msgstr ""
-#: ../../mod/thing.php:308 ../../mod/thing.php:355
+#: ../../mod/thing.php:307 ../../mod/thing.php:354
msgid "URL for photo of thing (optional)"
msgstr ""
-#: ../../mod/thing.php:346
+#: ../../mod/thing.php:345
msgid "Add Thing to your Profile"
msgstr ""
@@ -9287,6 +9240,10 @@ msgstr ""
msgid "Visit %s's profile [%s]"
msgstr ""
+#: ../../mod/viewconnections.php:101
+msgid "View Connections"
+msgstr ""
+
#: ../../mod/viewsrc.php:40
msgid "Source of Item"
msgstr ""
@@ -9446,3 +9403,52 @@ msgstr ""
#: ../../view/theme/redbasic/php/config.php:132
msgid "Set size of followup author photos"
msgstr ""
+
+#: ../../boot.php:1328
+#, php-format
+msgid "Update %s failed. See error logs."
+msgstr ""
+
+#: ../../boot.php:1331
+#, php-format
+msgid "Update Error at %s"
+msgstr ""
+
+#: ../../boot.php:1498
+msgid ""
+"Create an account to access services and applications within the Hubzilla"
+msgstr ""
+
+#: ../../boot.php:1520
+msgid "Password"
+msgstr ""
+
+#: ../../boot.php:1521
+msgid "Remember me"
+msgstr ""
+
+#: ../../boot.php:1524
+msgid "Forgot your password?"
+msgstr ""
+
+#: ../../boot.php:2154
+msgid "toggle mobile"
+msgstr ""
+
+#: ../../boot.php:2306
+msgid "Website SSL certificate is not valid. Please correct."
+msgstr ""
+
+#: ../../boot.php:2309
+#, php-format
+msgid "[hubzilla] Website SSL error for %s"
+msgstr ""
+
+#: ../../boot.php:2346
+msgid "Cron/Scheduled tasks not running."
+msgstr ""
+
+#: ../../boot.php:2350
+#, php-format
+msgid "[hubzilla] Cron tasks not running on %s"
+msgstr ""
diff --git a/util/shredder/JSON.sh b/util/shredder/JSON.sh
index 65f5f1f66..20c4d282e 100755
--- a/util/shredder/JSON.sh
+++ b/util/shredder/JSON.sh
@@ -1,3 +1,4 @@
+#!/bin/bash
# The MIT License
#
# Copyright (c) 2011 Dominic Tarr
diff --git a/version.inc b/version.inc
index f5b62614f..a9ccde1f5 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2016-01-20.1284H
+2016-01-27.1291H
diff --git a/view/en/htconfig.tpl b/view/en/htconfig.tpl
index 17ee7bfeb..17f19702f 100644
--- a/view/en/htconfig.tpl
+++ b/view/en/htconfig.tpl
@@ -28,7 +28,7 @@ $db_type = '{{$dbtype}}'; // an integer. 0 or unset for mysql, 1 for postgres
$default_timezone = '{{$timezone}}';
-// What is your site name?
+// What is your site name? DO NOT ADD A TRAILING SLASH!
$a->config['system']['baseurl'] = '{{$siteurl}}';
$a->config['system']['sitename'] = "Hubzilla";
diff --git a/view/es-es/hmessages.po b/view/es-es/hmessages.po
index 0ce5687fc..c8a63af9d 100644
--- a/view/es-es/hmessages.po
+++ b/view/es-es/hmessages.po
@@ -3,9 +3,7 @@
# This file is distributed under the same license as the Red package.
#
# Translators:
-# Alfonso <admin@alfonsomh.eu>, 2015
-# JACOB MALDONADO <axetransit@gmail.com>, 2015
-# jeroenpraat <jeroenpraat@xs4all.nl>, 2015
+# Alfonso <alfonsomthd@tutanota.com>, 2015
# Manuel Jiménez Friaza <mjfriaza@openmailbox.org>, 2015-2016
# Rafael, 2015
# tony baldwin <tonybaldwin@gmx.com>, 2014
@@ -13,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Redmatrix\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-01-15 00:03-0800\n"
-"PO-Revision-Date: 2016-01-16 14:43+0000\n"
+"POT-Creation-Date: 2016-01-22 00:03-0800\n"
+"PO-Revision-Date: 2016-01-24 08:19+0000\n"
"Last-Translator: Manuel Jiménez Friaza <mjfriaza@openmailbox.org>\n"
"Language-Team: Spanish (Spain) (http://www.transifex.com/Friendica/red-matrix/language/es_ES/)\n"
"MIME-Version: 1.0\n"
@@ -35,110 +33,8 @@ msgstr "La autenticación desde su servidor está bloqueada. Ha iniciado sesión
msgid "Welcome %s. Remote authentication successful."
msgstr "Bienvenido %s. La identificación desde su servidor se ha llevado a cabo correctamente."
-#: ../../boot.php:1319
-#, php-format
-msgid "Update %s failed. See error logs."
-msgstr "La actualización %s ha fallado. Mire el informe de errores."
-
-#: ../../boot.php:1322
-#, php-format
-msgid "Update Error at %s"
-msgstr "Error de actualización en %s"
-
-#: ../../boot.php:1489
-msgid ""
-"Create an account to access services and applications within the Hubzilla"
-msgstr "Crear una cuenta para acceder a los servicios y aplicaciones dentro de Hubzilla"
-
-#: ../../boot.php:1490 ../../include/nav.php:149 ../../mod/register.php:264
-msgid "Register"
-msgstr "Registrarse"
-
-#: ../../boot.php:1507 ../../include/nav.php:82 ../../include/nav.php:114
-msgid "Logout"
-msgstr "Finalizar sesión"
-
-#: ../../boot.php:1508 ../../include/apps.php:131 ../../include/nav.php:111
-msgid "Login"
-msgstr "Iniciar sesión"
-
-#: ../../boot.php:1510 ../../include/contact_selectors.php:79
-#: ../../mod/admin.php:891 ../../mod/admin.php:900 ../../mod/id.php:15
-#: ../../mod/id.php:16
-msgid "Email"
-msgstr "Correo electrónico"
-
-#: ../../boot.php:1511
-msgid "Password"
-msgstr "Contraseña"
-
-#: ../../boot.php:1512
-msgid "Remember me"
-msgstr "Recordarme"
-
-#: ../../boot.php:1512 ../../include/dir_fns.php:141
-#: ../../include/dir_fns.php:142 ../../include/dir_fns.php:143
-#: ../../mod/admin.php:421 ../../mod/api.php:102 ../../mod/events.php:447
-#: ../../mod/events.php:448 ../../mod/events.php:457
-#: ../../mod/filestorage.php:151 ../../mod/filestorage.php:159
-#: ../../mod/menu.php:96 ../../mod/menu.php:153 ../../mod/mitem.php:154
-#: ../../mod/mitem.php:155 ../../mod/mitem.php:228 ../../mod/mitem.php:229
-#: ../../mod/photos.php:626 ../../mod/removeme.php:60
-#: ../../mod/settings.php:577 ../../mod/connedit.php:644
-#: ../../mod/connedit.php:693 ../../view/theme/redbasic/php/config.php:104
-#: ../../view/theme/redbasic/php/config.php:129
-msgid "No"
-msgstr "No"
-
-#: ../../boot.php:1512 ../../include/dir_fns.php:141
-#: ../../include/dir_fns.php:142 ../../include/dir_fns.php:143
-#: ../../mod/admin.php:423 ../../mod/api.php:101 ../../mod/events.php:447
-#: ../../mod/events.php:448 ../../mod/events.php:457
-#: ../../mod/filestorage.php:151 ../../mod/filestorage.php:159
-#: ../../mod/menu.php:96 ../../mod/menu.php:153 ../../mod/mitem.php:154
-#: ../../mod/mitem.php:155 ../../mod/mitem.php:228 ../../mod/mitem.php:229
-#: ../../mod/photos.php:626 ../../mod/removeme.php:60
-#: ../../mod/settings.php:577 ../../view/theme/redbasic/php/config.php:104
-#: ../../view/theme/redbasic/php/config.php:129
-msgid "Yes"
-msgstr "Sí"
-
-#: ../../boot.php:1515
-msgid "Forgot your password?"
-msgstr "¿Olvidó su contraseña?"
-
-#: ../../boot.php:1516 ../../mod/lostpass.php:86
-msgid "Password Reset"
-msgstr "Restablecer la contraseña"
-
-#: ../../boot.php:2137
-msgid "toggle mobile"
-msgstr "cambiar a modo móvil"
-
-#: ../../boot.php:2289
-msgid "Website SSL certificate is not valid. Please correct."
-msgstr "El certificado SSL del sitio web no es válido. Por favor, solucione el problema."
-
-#: ../../boot.php:2292
-#, php-format
-msgid "[hubzilla] Website SSL error for %s"
-msgstr "[hubzilla] Error SSL del sitio web en %s"
-
-#: ../../boot.php:2329
-msgid "Cron/Scheduled tasks not running."
-msgstr "Las tareas del Planificador/Cron no están funcionando."
-
-#: ../../boot.php:2330 ../../include/datetime.php:263
-msgid "never"
-msgstr "nunca"
-
-#: ../../boot.php:2333
-#, php-format
-msgid "[hubzilla] Cron tasks not running on %s"
-msgstr "[hubzilla] Las tareas de Cron no están funcionando en %s"
-
-#: ../../include/Contact.php:101 ../../include/conversation.php:953
-#: ../../include/identity.php:947 ../../include/widgets.php:137
+#: ../../include/Contact.php:101 ../../include/conversation.php:961
+#: ../../include/identity.php:949 ../../include/widgets.php:137
#: ../../include/widgets.php:175 ../../mod/directory.php:318
#: ../../mod/match.php:64 ../../mod/suggest.php:52
msgid "Connect"
@@ -176,22 +72,22 @@ msgstr "Mensaje Privado"
#: ../../include/ItemObject.php:100 ../../include/RedDAV/RedBrowser.php:240
#: ../../include/apps.php:259 ../../include/menu.php:108
#: ../../include/page_widgets.php:8 ../../include/page_widgets.php:36
-#: ../../mod/blocks.php:153 ../../mod/connections.php:262
-#: ../../mod/connections.php:281 ../../mod/connections.php:301
-#: ../../mod/editblock.php:135 ../../mod/editlayout.php:134
-#: ../../mod/editpost.php:112 ../../mod/editwebpage.php:176
-#: ../../mod/layouts.php:183 ../../mod/menu.php:108 ../../mod/settings.php:648
-#: ../../mod/thing.php:257 ../../mod/webpages.php:181
+#: ../../mod/blocks.php:153 ../../mod/connections.php:284
+#: ../../mod/connections.php:304 ../../mod/editblock.php:135
+#: ../../mod/editlayout.php:134 ../../mod/editpost.php:112
+#: ../../mod/editwebpage.php:176 ../../mod/layouts.php:183
+#: ../../mod/menu.php:108 ../../mod/settings.php:648 ../../mod/thing.php:257
+#: ../../mod/webpages.php:181
msgid "Edit"
msgstr "Editar"
#: ../../include/ItemObject.php:120 ../../include/RedDAV/RedBrowser.php:241
#: ../../include/apps.php:260 ../../include/conversation.php:657
#: ../../mod/admin.php:895 ../../mod/admin.php:1054 ../../mod/blocks.php:155
-#: ../../mod/connections.php:263 ../../mod/editblock.php:181
-#: ../../mod/editlayout.php:179 ../../mod/editwebpage.php:223
-#: ../../mod/group.php:173 ../../mod/photos.php:1126
-#: ../../mod/settings.php:649 ../../mod/connedit.php:560
+#: ../../mod/connections.php:259 ../../mod/connedit.php:560
+#: ../../mod/editblock.php:181 ../../mod/editlayout.php:179
+#: ../../mod/editwebpage.php:223 ../../mod/group.php:173
+#: ../../mod/photos.php:1126 ../../mod/settings.php:649
#: ../../mod/thing.php:258 ../../mod/webpages.php:183
msgid "Delete"
msgstr "Eliminar"
@@ -229,13 +125,13 @@ msgid "I abstain"
msgstr "Me abstengo"
#: ../../include/ItemObject.php:175 ../../include/ItemObject.php:187
-#: ../../include/conversation.php:1697 ../../mod/photos.php:1079
+#: ../../include/conversation.php:1707 ../../mod/photos.php:1079
#: ../../mod/photos.php:1091
msgid "View all"
msgstr "Ver todo"
-#: ../../include/ItemObject.php:179 ../../include/conversation.php:1721
-#: ../../include/identity.php:1258 ../../include/taxonomy.php:414
+#: ../../include/ItemObject.php:179 ../../include/conversation.php:1731
+#: ../../include/taxonomy.php:414 ../../include/identity.php:1262
#: ../../mod/photos.php:1083
msgctxt "noun"
msgid "Like"
@@ -243,7 +139,7 @@ msgid_plural "Likes"
msgstr[0] "Me gusta"
msgstr[1] "Me gusta"
-#: ../../include/ItemObject.php:184 ../../include/conversation.php:1724
+#: ../../include/ItemObject.php:184 ../../include/conversation.php:1734
#: ../../mod/photos.php:1088
msgctxt "noun"
msgid "Dislike"
@@ -378,7 +274,7 @@ msgid "Close"
msgstr "Cerrar"
#: ../../include/ItemObject.php:389 ../../include/conversation.php:740
-#: ../../include/conversation.php:1227 ../../mod/editblock.php:150
+#: ../../include/conversation.php:1237 ../../mod/editblock.php:150
#: ../../mod/editlayout.php:148 ../../mod/editpost.php:129
#: ../../mod/editwebpage.php:190 ../../mod/photos.php:1026
msgid "Please wait"
@@ -403,50 +299,50 @@ msgstr "Comentar"
#: ../../mod/admin.php:453 ../../mod/admin.php:596 ../../mod/admin.php:888
#: ../../mod/admin.php:1052 ../../mod/admin.php:1228 ../../mod/admin.php:1423
#: ../../mod/admin.php:1508 ../../mod/appman.php:99 ../../mod/chat.php:184
-#: ../../mod/chat.php:213 ../../mod/connect.php:93 ../../mod/events.php:461
-#: ../../mod/events.php:658 ../../mod/filestorage.php:156
-#: ../../mod/fsuggest.php:108 ../../mod/group.php:81 ../../mod/import.php:527
-#: ../../mod/import_items.php:122 ../../mod/invite.php:142
+#: ../../mod/chat.php:213 ../../mod/connect.php:93 ../../mod/connedit.php:720
+#: ../../mod/events.php:461 ../../mod/events.php:658
+#: ../../mod/filestorage.php:156 ../../mod/fsuggest.php:108
+#: ../../mod/group.php:81 ../../mod/import.php:527
+#: ../../mod/import_items.php:116 ../../mod/invite.php:142
#: ../../mod/locs.php:116 ../../mod/mail.php:380 ../../mod/mitem.php:231
-#: ../../mod/mood.php:135 ../../mod/pconfig.php:108 ../../mod/pdledit.php:58
+#: ../../mod/mood.php:135 ../../mod/pconfig.php:108 ../../mod/pdledit.php:59
#: ../../mod/photos.php:637 ../../mod/photos.php:1005
#: ../../mod/photos.php:1045 ../../mod/photos.php:1163 ../../mod/poke.php:171
#: ../../mod/profiles.php:675 ../../mod/rate.php:168
#: ../../mod/settings.php:586 ../../mod/settings.php:698
#: ../../mod/settings.php:726 ../../mod/settings.php:749
#: ../../mod/settings.php:834 ../../mod/settings.php:1023
-#: ../../mod/setup.php:331 ../../mod/setup.php:371 ../../mod/connedit.php:724
-#: ../../mod/sources.php:104 ../../mod/sources.php:138 ../../mod/thing.php:313
-#: ../../mod/thing.php:359 ../../mod/xchan.php:11
-#: ../../view/theme/redbasic/php/config.php:99
+#: ../../mod/setup.php:331 ../../mod/setup.php:371 ../../mod/sources.php:104
+#: ../../mod/sources.php:138 ../../mod/thing.php:313 ../../mod/thing.php:359
+#: ../../mod/xchan.php:11 ../../view/theme/redbasic/php/config.php:99
msgid "Submit"
msgstr "Enviar"
-#: ../../include/ItemObject.php:698 ../../include/conversation.php:1199
+#: ../../include/ItemObject.php:698 ../../include/conversation.php:1209
#: ../../mod/editblock.php:136 ../../mod/editlayout.php:135
#: ../../mod/editpost.php:113 ../../mod/editwebpage.php:177
msgid "Bold"
msgstr "Negrita"
-#: ../../include/ItemObject.php:699 ../../include/conversation.php:1200
+#: ../../include/ItemObject.php:699 ../../include/conversation.php:1210
#: ../../mod/editblock.php:137 ../../mod/editlayout.php:136
#: ../../mod/editpost.php:114 ../../mod/editwebpage.php:178
msgid "Italic"
msgstr "Itálico "
-#: ../../include/ItemObject.php:700 ../../include/conversation.php:1201
+#: ../../include/ItemObject.php:700 ../../include/conversation.php:1211
#: ../../mod/editblock.php:138 ../../mod/editlayout.php:137
#: ../../mod/editpost.php:115 ../../mod/editwebpage.php:179
msgid "Underline"
msgstr "Subrayar"
-#: ../../include/ItemObject.php:701 ../../include/conversation.php:1202
+#: ../../include/ItemObject.php:701 ../../include/conversation.php:1212
#: ../../mod/editblock.php:139 ../../mod/editlayout.php:138
#: ../../mod/editpost.php:116 ../../mod/editwebpage.php:180
msgid "Quote"
msgstr "Citar"
-#: ../../include/ItemObject.php:702 ../../include/conversation.php:1203
+#: ../../include/ItemObject.php:702 ../../include/conversation.php:1213
#: ../../mod/editblock.php:140 ../../mod/editlayout.php:139
#: ../../mod/editpost.php:117 ../../mod/editwebpage.php:181
msgid "Code"
@@ -464,7 +360,7 @@ msgstr "Insertar enlace"
msgid "Video"
msgstr "Vídeo"
-#: ../../include/ItemObject.php:706 ../../include/conversation.php:1169
+#: ../../include/ItemObject.php:706 ../../include/conversation.php:1179
#: ../../include/page_widgets.php:40 ../../mod/editblock.php:171
#: ../../mod/editpost.php:149 ../../mod/editwebpage.php:212
#: ../../mod/events.php:458 ../../mod/photos.php:1046
@@ -472,7 +368,7 @@ msgstr "Vídeo"
msgid "Preview"
msgstr "Previsualizar"
-#: ../../include/ItemObject.php:709 ../../include/conversation.php:1257
+#: ../../include/ItemObject.php:709 ../../include/conversation.php:1267
#: ../../mod/editpost.php:157 ../../mod/mail.php:255 ../../mod/mail.php:385
msgid "Encrypt text"
msgstr "Cifrar texto"
@@ -507,14 +403,14 @@ msgid "Schedule Outbox"
msgstr "Programar bandeja de salida"
#: ../../include/RedDAV/RedBrowser.php:164 ../../include/apps.php:360
-#: ../../include/apps.php:415 ../../include/conversation.php:1027
-#: ../../include/widgets.php:1366 ../../mod/photos.php:754
+#: ../../include/apps.php:415 ../../include/conversation.php:1037
+#: ../../include/widgets.php:1368 ../../mod/photos.php:754
#: ../../mod/photos.php:1195
msgid "Unknown"
msgstr "Desconocido"
#: ../../include/RedDAV/RedBrowser.php:226 ../../include/apps.php:135
-#: ../../include/conversation.php:1629 ../../include/nav.php:93
+#: ../../include/conversation.php:1639 ../../include/nav.php:93
#: ../../mod/fbrowser.php:109
msgid "Files"
msgstr "Ficheros"
@@ -536,7 +432,7 @@ msgid "Create"
msgstr "Crear"
#: ../../include/RedDAV/RedBrowser.php:231
-#: ../../include/RedDAV/RedBrowser.php:305 ../../include/widgets.php:1379
+#: ../../include/RedDAV/RedBrowser.php:305 ../../include/widgets.php:1381
#: ../../mod/photos.php:781 ../../mod/photos.php:1316
#: ../../mod/profile_photo.php:453 ../../mod/cover_photo.php:353
msgid "Upload"
@@ -622,7 +518,7 @@ msgid "Registration request at %s"
msgstr "Solicitud de registro en %s"
#: ../../include/account.php:317 ../../include/account.php:344
-#: ../../include/account.php:404 ../../include/network.php:1659
+#: ../../include/account.php:404 ../../include/network.php:1660
msgid "Administrator"
msgstr "Administrador"
@@ -713,7 +609,7 @@ msgstr "Cronología pública"
msgid "Site Admin"
msgstr "Adminstrador del sitio"
-#: ../../include/apps.php:129 ../../include/conversation.php:1655
+#: ../../include/apps.php:129 ../../include/conversation.php:1665
#: ../../include/nav.php:103
msgid "Bookmarks"
msgstr "Marcadores"
@@ -722,6 +618,10 @@ msgstr "Marcadores"
msgid "Address Book"
msgstr "Libreta de direcciones"
+#: ../../include/apps.php:131 ../../include/nav.php:111 ../../boot.php:1508
+msgid "Login"
+msgstr "Iniciar sesión"
+
#: ../../include/apps.php:132 ../../include/nav.php:200
#: ../../mod/manage.php:160
msgid "Channel Manager"
@@ -737,7 +637,7 @@ msgstr "Red"
msgid "Settings"
msgstr "Ajustes"
-#: ../../include/apps.php:136 ../../include/conversation.php:1665
+#: ../../include/apps.php:136 ../../include/conversation.php:1675
#: ../../include/nav.php:107 ../../mod/webpages.php:178
msgid "Webpages"
msgstr "Páginas web"
@@ -746,12 +646,12 @@ msgstr "Páginas web"
msgid "Channel Home"
msgstr "Mi canal"
-#: ../../include/apps.php:138 ../../include/identity.php:1232
-#: ../../include/identity.php:1349 ../../mod/profperm.php:112
+#: ../../include/apps.php:138 ../../include/identity.php:1236
+#: ../../include/identity.php:1353 ../../mod/profperm.php:112
msgid "Profile"
msgstr "Perfil"
-#: ../../include/apps.php:139 ../../include/conversation.php:1622
+#: ../../include/apps.php:139 ../../include/conversation.php:1632
#: ../../include/nav.php:92 ../../mod/fbrowser.php:25
msgid "Photos"
msgstr "Fotos"
@@ -777,7 +677,7 @@ msgstr "Correo"
msgid "Mood"
msgstr "Estado de ánimo"
-#: ../../include/apps.php:145 ../../include/conversation.php:956
+#: ../../include/apps.php:145 ../../include/conversation.php:965
msgid "Poke"
msgstr "Toques y otras cosas"
@@ -787,7 +687,7 @@ msgstr "Chat"
#: ../../include/apps.php:147 ../../include/nav.php:159
#: ../../include/text.php:885 ../../include/text.php:897
-#: ../../mod/connections.php:297 ../../mod/search.php:40
+#: ../../mod/connections.php:300 ../../mod/search.php:40
msgid "Search"
msgstr "Buscar"
@@ -807,7 +707,7 @@ msgstr "Canal aleatorio"
msgid "Invite"
msgstr "Invitar"
-#: ../../include/apps.php:152 ../../include/widgets.php:1252
+#: ../../include/apps.php:152 ../../include/widgets.php:1254
msgid "Features"
msgstr "Funcionalidades"
@@ -843,37 +743,37 @@ msgstr "Comprar"
#: ../../include/attach.php:351 ../../include/attach.php:358
#: ../../include/attach.php:436 ../../include/attach.php:888
#: ../../include/attach.php:959 ../../include/attach.php:1111
-#: ../../include/chat.php:133 ../../include/items.php:4405
-#: ../../include/photos.php:29 ../../index.php:182 ../../index.php:367
+#: ../../include/chat.php:133 ../../include/photos.php:29
+#: ../../include/items.php:4407 ../../index.php:186 ../../index.php:371
#: ../../mod/achievements.php:30 ../../mod/api.php:26 ../../mod/api.php:31
#: ../../mod/appman.php:66 ../../mod/authtest.php:13 ../../mod/block.php:22
#: ../../mod/block.php:72 ../../mod/blocks.php:69 ../../mod/blocks.php:76
#: ../../mod/bookmarks.php:48 ../../mod/channel.php:100
#: ../../mod/channel.php:214 ../../mod/channel.php:254 ../../mod/chat.php:94
#: ../../mod/chat.php:99 ../../mod/common.php:35 ../../mod/connections.php:29
-#: ../../mod/editblock.php:65 ../../mod/editlayout.php:63
-#: ../../mod/editlayout.php:87 ../../mod/editpost.php:13
-#: ../../mod/editwebpage.php:64 ../../mod/editwebpage.php:86
-#: ../../mod/editwebpage.php:101 ../../mod/editwebpage.php:125
-#: ../../mod/events.php:260 ../../mod/filestorage.php:18
-#: ../../mod/filestorage.php:73 ../../mod/filestorage.php:88
-#: ../../mod/filestorage.php:115 ../../mod/fsuggest.php:78
-#: ../../mod/group.php:9 ../../mod/id.php:71 ../../mod/invite.php:13
-#: ../../mod/invite.php:87 ../../mod/item.php:206 ../../mod/item.php:214
-#: ../../mod/item.php:1049 ../../mod/layouts.php:69 ../../mod/layouts.php:76
-#: ../../mod/layouts.php:87 ../../mod/like.php:177 ../../mod/locs.php:83
-#: ../../mod/mail.php:126 ../../mod/manage.php:6 ../../mod/menu.php:74
-#: ../../mod/message.php:16 ../../mod/mitem.php:111 ../../mod/mood.php:112
-#: ../../mod/network.php:12 ../../mod/new_channel.php:68
-#: ../../mod/new_channel.php:99 ../../mod/notifications.php:66
-#: ../../mod/page.php:31 ../../mod/page.php:86 ../../mod/pdledit.php:21
-#: ../../mod/photos.php:70 ../../mod/poke.php:133 ../../mod/profile.php:64
-#: ../../mod/profile.php:72 ../../mod/profile_photo.php:341
-#: ../../mod/profile_photo.php:354 ../../mod/profiles.php:198
-#: ../../mod/profiles.php:584 ../../mod/rate.php:111 ../../mod/register.php:73
-#: ../../mod/regmod.php:17 ../../mod/service_limits.php:7
-#: ../../mod/settings.php:568 ../../mod/setup.php:227
-#: ../../mod/connedit.php:355 ../../mod/sharedwithme.php:7
+#: ../../mod/connedit.php:355 ../../mod/editblock.php:65
+#: ../../mod/editlayout.php:63 ../../mod/editlayout.php:87
+#: ../../mod/editpost.php:13 ../../mod/editwebpage.php:64
+#: ../../mod/editwebpage.php:86 ../../mod/editwebpage.php:101
+#: ../../mod/editwebpage.php:125 ../../mod/events.php:260
+#: ../../mod/filestorage.php:18 ../../mod/filestorage.php:73
+#: ../../mod/filestorage.php:88 ../../mod/filestorage.php:115
+#: ../../mod/fsuggest.php:78 ../../mod/group.php:9 ../../mod/id.php:71
+#: ../../mod/invite.php:13 ../../mod/invite.php:87 ../../mod/item.php:206
+#: ../../mod/item.php:214 ../../mod/item.php:1050 ../../mod/layouts.php:69
+#: ../../mod/layouts.php:76 ../../mod/layouts.php:87 ../../mod/like.php:177
+#: ../../mod/locs.php:83 ../../mod/mail.php:126 ../../mod/manage.php:6
+#: ../../mod/menu.php:74 ../../mod/message.php:16 ../../mod/mitem.php:111
+#: ../../mod/mood.php:112 ../../mod/network.php:12
+#: ../../mod/new_channel.php:68 ../../mod/new_channel.php:99
+#: ../../mod/notifications.php:66 ../../mod/page.php:31 ../../mod/page.php:86
+#: ../../mod/pdledit.php:22 ../../mod/photos.php:70 ../../mod/poke.php:133
+#: ../../mod/profile.php:64 ../../mod/profile.php:72
+#: ../../mod/profile_photo.php:341 ../../mod/profile_photo.php:354
+#: ../../mod/profiles.php:198 ../../mod/profiles.php:584
+#: ../../mod/rate.php:111 ../../mod/register.php:73 ../../mod/regmod.php:17
+#: ../../mod/service_limits.php:7 ../../mod/settings.php:568
+#: ../../mod/setup.php:227 ../../mod/sharedwithme.php:7
#: ../../mod/sources.php:66 ../../mod/suggest.php:26 ../../mod/thing.php:271
#: ../../mod/thing.php:291 ../../mod/thing.php:328
#: ../../mod/viewconnections.php:22 ../../mod/viewconnections.php:27
@@ -980,7 +880,7 @@ msgid "Finishes:"
msgstr "Finaliza:"
#: ../../include/bb2diaspora.php:487 ../../include/event.php:52
-#: ../../include/identity.php:998 ../../include/text.php:1425
+#: ../../include/identity.php:1000 ../../include/text.php:1425
#: ../../mod/directory.php:304
msgid "Location:"
msgstr "Ubicación:"
@@ -1077,66 +977,6 @@ msgstr "La sala está llena."
msgid "Default"
msgstr "Predeterminado"
-#: ../../include/contact_selectors.php:56
-msgid "Frequently"
-msgstr "Frecuentemente"
-
-#: ../../include/contact_selectors.php:57
-msgid "Hourly"
-msgstr "Cada hora"
-
-#: ../../include/contact_selectors.php:58
-msgid "Twice daily"
-msgstr "Dos veces al día"
-
-#: ../../include/contact_selectors.php:59
-msgid "Daily"
-msgstr "Diariamente"
-
-#: ../../include/contact_selectors.php:60
-msgid "Weekly"
-msgstr "Semanalmente"
-
-#: ../../include/contact_selectors.php:61
-msgid "Monthly"
-msgstr "Mensualmente"
-
-#: ../../include/contact_selectors.php:76
-msgid "Friendica"
-msgstr "Friendica"
-
-#: ../../include/contact_selectors.php:77
-msgid "OStatus"
-msgstr "OStatus"
-
-#: ../../include/contact_selectors.php:78
-msgid "RSS/Atom"
-msgstr "RSS/Atom"
-
-#: ../../include/contact_selectors.php:80
-msgid "Diaspora"
-msgstr "Diaspora"
-
-#: ../../include/contact_selectors.php:81
-msgid "Facebook"
-msgstr "Facebook"
-
-#: ../../include/contact_selectors.php:82
-msgid "Zot!"
-msgstr "Zot!"
-
-#: ../../include/contact_selectors.php:83
-msgid "LinkedIn"
-msgstr "LinkedIn"
-
-#: ../../include/contact_selectors.php:84
-msgid "XMPP/IM"
-msgstr "XMPP/IM"
-
-#: ../../include/contact_selectors.php:85
-msgid "MySpace"
-msgstr "MySpace"
-
#: ../../include/contact_widgets.php:14
#, php-format
msgid "%d invitation available"
@@ -1164,7 +1004,7 @@ msgstr "Conectar/Seguir"
msgid "Examples: Robert Morgenstein, Fishing"
msgstr "Ejemplos: José Fernández, Pesca"
-#: ../../include/contact_widgets.php:26 ../../mod/connections.php:300
+#: ../../include/contact_widgets.php:26 ../../mod/connections.php:303
#: ../../mod/directory.php:381 ../../mod/directory.php:386
msgid "Find"
msgstr "Encontrar"
@@ -1186,7 +1026,7 @@ msgstr "Invitar a amigos"
msgid "Advanced example: name=fred and country=iceland"
msgstr "Ejemplo avanzado: nombre=juan y país=españa"
-#: ../../include/contact_widgets.php:57 ../../include/features.php:92
+#: ../../include/contact_widgets.php:57 ../../include/features.php:93
#: ../../include/widgets.php:304
msgid "Saved Folders"
msgstr "Carpetas guardadas"
@@ -1336,389 +1176,385 @@ msgstr "Cargando..."
msgid "Delete Selected Items"
msgstr "Eliminar elementos seleccionados"
-#: ../../include/conversation.php:946
+#: ../../include/conversation.php:953
msgid "View Source"
msgstr "Ver la fuente original de la publicación"
-#: ../../include/conversation.php:947
+#: ../../include/conversation.php:954
msgid "Follow Thread"
msgstr "Seguir este hilo"
-#: ../../include/conversation.php:948
+#: ../../include/conversation.php:955
msgid "Unfollow Thread"
msgstr "Dejar de seguir este hilo"
-#: ../../include/conversation.php:949
-msgid "View Status"
-msgstr "Ver mi estado actual"
-
-#: ../../include/conversation.php:950 ../../include/nav.php:86
+#: ../../include/conversation.php:959 ../../include/nav.php:86
#: ../../mod/connedit.php:507
msgid "View Profile"
msgstr "Ver el perfil"
-#: ../../include/conversation.php:951
-msgid "View Photos"
-msgstr "Ver fotos"
-
-#: ../../include/conversation.php:952
+#: ../../include/conversation.php:960
msgid "Activity/Posts"
msgstr "Actividad y publicaciones"
-#: ../../include/conversation.php:954
+#: ../../include/conversation.php:962
msgid "Edit Connection"
msgstr "Editar conexión"
-#: ../../include/conversation.php:955
-msgid "Send PM"
-msgstr "Enviar un mensaje privado"
+#: ../../include/conversation.php:963
+msgid "Message"
+msgstr "Mensaje"
+
+#: ../../include/conversation.php:964 ../../mod/ratings.php:99
+msgid "Ratings"
+msgstr "Valoraciones"
-#: ../../include/conversation.php:1070
+#: ../../include/conversation.php:1080
#, php-format
msgid "%s likes this."
msgstr "A %s le gusta esto."
-#: ../../include/conversation.php:1070
+#: ../../include/conversation.php:1080
#, php-format
msgid "%s doesn't like this."
msgstr "A %s no le gusta esto."
-#: ../../include/conversation.php:1074
+#: ../../include/conversation.php:1084
#, php-format
msgid "<span %1$s>%2$d people</span> like this."
msgid_plural "<span %1$s>%2$d people</span> like this."
msgstr[0] "a <span %1$s>%2$d personas</span> le gusta esto."
msgstr[1] "A <span %1$s>%2$d personas</span> les gusta esto."
-#: ../../include/conversation.php:1076
+#: ../../include/conversation.php:1086
#, php-format
msgid "<span %1$s>%2$d people</span> don't like this."
msgid_plural "<span %1$s>%2$d people</span> don't like this."
msgstr[0] "a <span %1$s>%2$d personas</span> no les gusta esto."
msgstr[1] "A <span %1$s>%2$d personas</span> no les gusta esto."
-#: ../../include/conversation.php:1082
+#: ../../include/conversation.php:1092
msgid "and"
msgstr "y"
-#: ../../include/conversation.php:1085
+#: ../../include/conversation.php:1095
#, php-format
msgid ", and %d other people"
msgid_plural ", and %d other people"
msgstr[0] ", y %d persona más"
msgstr[1] ", y %d personas más"
-#: ../../include/conversation.php:1086
+#: ../../include/conversation.php:1096
#, php-format
msgid "%s like this."
msgstr "A %s le gusta esto."
-#: ../../include/conversation.php:1086
+#: ../../include/conversation.php:1096
#, php-format
msgid "%s don't like this."
msgstr "A %s no le gusta esto."
-#: ../../include/conversation.php:1154
+#: ../../include/conversation.php:1164
msgid "Visible to <strong>everybody</strong>"
msgstr "Visible para <strong>cualquiera</strong>"
-#: ../../include/conversation.php:1155 ../../mod/mail.php:202
+#: ../../include/conversation.php:1165 ../../mod/mail.php:202
#: ../../mod/mail.php:316
msgid "Please enter a link URL:"
msgstr "Por favor, introduzca la dirección del enlace:"
-#: ../../include/conversation.php:1156
+#: ../../include/conversation.php:1166
msgid "Please enter a video link/URL:"
msgstr "Por favor, introduzca un enlace de vídeo:"
-#: ../../include/conversation.php:1157
+#: ../../include/conversation.php:1167
msgid "Please enter an audio link/URL:"
msgstr "Por favor, introduzca un enlace de audio:"
-#: ../../include/conversation.php:1158
+#: ../../include/conversation.php:1168
msgid "Tag term:"
msgstr "Término de la etiqueta:"
-#: ../../include/conversation.php:1159 ../../mod/filer.php:48
+#: ../../include/conversation.php:1169 ../../mod/filer.php:48
msgid "Save to Folder:"
msgstr "Guardar en carpeta:"
-#: ../../include/conversation.php:1160
+#: ../../include/conversation.php:1170
msgid "Where are you right now?"
msgstr "¿Donde está ahora?"
-#: ../../include/conversation.php:1161 ../../mod/editpost.php:56
+#: ../../include/conversation.php:1171 ../../mod/editpost.php:56
#: ../../mod/mail.php:203 ../../mod/mail.php:317
msgid "Expires YYYY-MM-DD HH:MM"
msgstr "Caduca YYYY-MM-DD HH:MM"
-#: ../../include/conversation.php:1192 ../../mod/blocks.php:154
+#: ../../include/conversation.php:1202 ../../mod/blocks.php:154
#: ../../mod/layouts.php:184 ../../mod/photos.php:1025
#: ../../mod/webpages.php:182
msgid "Share"
msgstr "Compartir"
-#: ../../include/conversation.php:1194
+#: ../../include/conversation.php:1204
msgid "Page link name"
msgstr "Nombre de enlace de página"
-#: ../../include/conversation.php:1197
+#: ../../include/conversation.php:1207
msgid "Post as"
msgstr "Publicar como"
-#: ../../include/conversation.php:1204 ../../mod/editblock.php:142
+#: ../../include/conversation.php:1214 ../../mod/editblock.php:142
#: ../../mod/editlayout.php:140 ../../mod/editpost.php:118
#: ../../mod/editwebpage.php:182
msgid "Upload photo"
msgstr "Subir foto"
-#: ../../include/conversation.php:1205
+#: ../../include/conversation.php:1215
msgid "upload photo"
msgstr "subir foto"
-#: ../../include/conversation.php:1206 ../../mod/editblock.php:143
+#: ../../include/conversation.php:1216 ../../mod/editblock.php:143
#: ../../mod/editlayout.php:141 ../../mod/editpost.php:119
#: ../../mod/editwebpage.php:183 ../../mod/mail.php:248 ../../mod/mail.php:378
msgid "Attach file"
msgstr "Adjuntar fichero"
-#: ../../include/conversation.php:1207
+#: ../../include/conversation.php:1217
msgid "attach file"
msgstr "adjuntar fichero"
-#: ../../include/conversation.php:1208 ../../mod/editblock.php:144
+#: ../../include/conversation.php:1218 ../../mod/editblock.php:144
#: ../../mod/editlayout.php:142 ../../mod/editpost.php:120
#: ../../mod/editwebpage.php:184 ../../mod/mail.php:249 ../../mod/mail.php:379
msgid "Insert web link"
msgstr "Insertar enlace web"
-#: ../../include/conversation.php:1209
+#: ../../include/conversation.php:1219
msgid "web link"
msgstr "enlace web"
-#: ../../include/conversation.php:1210
+#: ../../include/conversation.php:1220
msgid "Insert video link"
msgstr "Insertar enlace de vídeo"
-#: ../../include/conversation.php:1211
+#: ../../include/conversation.php:1221
msgid "video link"
msgstr "enlace de vídeo"
-#: ../../include/conversation.php:1212
+#: ../../include/conversation.php:1222
msgid "Insert audio link"
msgstr "Insertar enlace de audio"
-#: ../../include/conversation.php:1213
+#: ../../include/conversation.php:1223
msgid "audio link"
msgstr "enlace de audio"
-#: ../../include/conversation.php:1214 ../../mod/editblock.php:148
+#: ../../include/conversation.php:1224 ../../mod/editblock.php:148
#: ../../mod/editlayout.php:146 ../../mod/editpost.php:124
#: ../../mod/editwebpage.php:188
msgid "Set your location"
msgstr "Establecer su ubicación"
-#: ../../include/conversation.php:1215
+#: ../../include/conversation.php:1225
msgid "set location"
msgstr "establecer ubicación"
-#: ../../include/conversation.php:1216 ../../mod/editpost.php:126
+#: ../../include/conversation.php:1226 ../../mod/editpost.php:126
msgid "Toggle voting"
msgstr "Cambiar votación"
-#: ../../include/conversation.php:1219 ../../mod/editblock.php:149
+#: ../../include/conversation.php:1229 ../../mod/editblock.php:149
#: ../../mod/editlayout.php:147 ../../mod/editpost.php:125
#: ../../mod/editwebpage.php:189
msgid "Clear browser location"
msgstr "Eliminar los datos de ubicación del navegador"
-#: ../../include/conversation.php:1220
+#: ../../include/conversation.php:1230
msgid "clear location"
msgstr "borrar los datos de ubicación"
-#: ../../include/conversation.php:1222 ../../mod/editblock.php:162
+#: ../../include/conversation.php:1232 ../../mod/editblock.php:162
#: ../../mod/editpost.php:141 ../../mod/editwebpage.php:205
msgid "Title (optional)"
msgstr "Título (opcional)"
-#: ../../include/conversation.php:1226 ../../mod/editblock.php:165
+#: ../../include/conversation.php:1236 ../../mod/editblock.php:165
#: ../../mod/editlayout.php:163 ../../mod/editpost.php:143
#: ../../mod/editwebpage.php:207
msgid "Categories (optional, comma-separated list)"
msgstr "Categorías (opcional, lista separada por comas)"
-#: ../../include/conversation.php:1228 ../../mod/editblock.php:151
+#: ../../include/conversation.php:1238 ../../mod/editblock.php:151
#: ../../mod/editlayout.php:149 ../../mod/editpost.php:130
#: ../../mod/editwebpage.php:191 ../../mod/events.php:459
msgid "Permission settings"
msgstr "Configuración de permisos"
-#: ../../include/conversation.php:1229
+#: ../../include/conversation.php:1239
msgid "permissions"
msgstr "permisos"
-#: ../../include/conversation.php:1237 ../../mod/editblock.php:159
+#: ../../include/conversation.php:1247 ../../mod/editblock.php:159
#: ../../mod/editlayout.php:156 ../../mod/editpost.php:138
#: ../../mod/editwebpage.php:200
msgid "Public post"
msgstr "Entrada pública"
-#: ../../include/conversation.php:1239 ../../mod/editblock.php:166
+#: ../../include/conversation.php:1249 ../../mod/editblock.php:166
#: ../../mod/editlayout.php:164 ../../mod/editpost.php:144
#: ../../mod/editwebpage.php:208
msgid "Example: bob@example.com, mary@example.com"
msgstr "Ejemplo: roberto@ejemplo.com, maría@ejemplo.com"
-#: ../../include/conversation.php:1252 ../../mod/editblock.php:176
+#: ../../include/conversation.php:1262 ../../mod/editblock.php:176
#: ../../mod/editlayout.php:173 ../../mod/editpost.php:155
#: ../../mod/editwebpage.php:217 ../../mod/mail.php:253 ../../mod/mail.php:383
msgid "Set expiration date"
msgstr "Configurar fecha de caducidad"
-#: ../../include/conversation.php:1255
+#: ../../include/conversation.php:1265
msgid "Set publish date"
msgstr "Establecer la fecha de publicación"
-#: ../../include/conversation.php:1259 ../../mod/editpost.php:159
+#: ../../include/conversation.php:1269 ../../mod/editpost.php:159
msgid "OK"
msgstr "OK"
-#: ../../include/conversation.php:1260 ../../mod/editpost.php:160
+#: ../../include/conversation.php:1270 ../../mod/editpost.php:160
#: ../../mod/fbrowser.php:77 ../../mod/fbrowser.php:112
#: ../../mod/settings.php:587 ../../mod/settings.php:613
#: ../../mod/tagrm.php:11 ../../mod/tagrm.php:134
msgid "Cancel"
msgstr "Cancelar"
-#: ../../include/conversation.php:1503
+#: ../../include/conversation.php:1513
msgid "Discover"
msgstr "Descubrir"
-#: ../../include/conversation.php:1506
+#: ../../include/conversation.php:1516
msgid "Imported public streams"
msgstr "Contenidos públicos importados"
-#: ../../include/conversation.php:1511
+#: ../../include/conversation.php:1521
msgid "Commented Order"
msgstr "Comentarios recientes"
-#: ../../include/conversation.php:1514
+#: ../../include/conversation.php:1524
msgid "Sort by Comment Date"
msgstr "Ordenar por fecha de comentario"
-#: ../../include/conversation.php:1518
+#: ../../include/conversation.php:1528
msgid "Posted Order"
msgstr "Publicaciones recientes"
-#: ../../include/conversation.php:1521
+#: ../../include/conversation.php:1531
msgid "Sort by Post Date"
msgstr "Ordenar por fecha de publicación"
-#: ../../include/conversation.php:1526 ../../include/widgets.php:95
+#: ../../include/conversation.php:1536 ../../include/widgets.php:95
msgid "Personal"
msgstr "Personales"
-#: ../../include/conversation.php:1529
+#: ../../include/conversation.php:1539
msgid "Posts that mention or involve you"
msgstr "Publicaciones que le mencionan o involucran"
-#: ../../include/conversation.php:1535 ../../mod/connections.php:72
+#: ../../include/conversation.php:1545 ../../mod/connections.php:72
#: ../../mod/connections.php:82 ../../mod/menu.php:112
msgid "New"
msgstr "Nuevas"
-#: ../../include/conversation.php:1538
+#: ../../include/conversation.php:1548
msgid "Activity Stream - by date"
msgstr "Contenido - por fecha"
-#: ../../include/conversation.php:1544
+#: ../../include/conversation.php:1554
msgid "Starred"
msgstr "Preferidas"
-#: ../../include/conversation.php:1547
+#: ../../include/conversation.php:1557
msgid "Favourite Posts"
msgstr "Publicaciones favoritas"
-#: ../../include/conversation.php:1554
+#: ../../include/conversation.php:1564
msgid "Spam"
msgstr "Correo basura"
-#: ../../include/conversation.php:1557
+#: ../../include/conversation.php:1567
msgid "Posts flagged as SPAM"
msgstr "Publicaciones marcadas como basura"
-#: ../../include/conversation.php:1601 ../../mod/admin.php:1059
+#: ../../include/conversation.php:1611 ../../mod/admin.php:1059
msgid "Channel"
msgstr "Canal"
-#: ../../include/conversation.php:1604
+#: ../../include/conversation.php:1614
msgid "Status Messages and Posts"
msgstr "Mensajes de estado y publicaciones"
-#: ../../include/conversation.php:1613
+#: ../../include/conversation.php:1623
msgid "About"
msgstr "Mi perfil"
-#: ../../include/conversation.php:1616
+#: ../../include/conversation.php:1626
msgid "Profile Details"
msgstr "Detalles del perfil"
-#: ../../include/conversation.php:1625 ../../include/photos.php:506
+#: ../../include/conversation.php:1635 ../../include/photos.php:506
msgid "Photo Albums"
msgstr "Álbumes de fotos"
-#: ../../include/conversation.php:1632
+#: ../../include/conversation.php:1642
msgid "Files and Storage"
msgstr "Ficheros y repositorio"
-#: ../../include/conversation.php:1642 ../../include/conversation.php:1645
+#: ../../include/conversation.php:1652 ../../include/conversation.php:1655
msgid "Chatrooms"
msgstr "Salas de chat"
-#: ../../include/conversation.php:1658
+#: ../../include/conversation.php:1668
msgid "Saved Bookmarks"
msgstr "Marcadores guardados"
-#: ../../include/conversation.php:1668
+#: ../../include/conversation.php:1678
msgid "Manage Webpages"
msgstr "Administrar páginas web"
-#: ../../include/conversation.php:1727
+#: ../../include/conversation.php:1737
msgctxt "noun"
msgid "Attending"
msgid_plural "Attending"
msgstr[0] "Participaré"
msgstr[1] "Participaré"
-#: ../../include/conversation.php:1730
+#: ../../include/conversation.php:1740
msgctxt "noun"
msgid "Not Attending"
msgid_plural "Not Attending"
msgstr[0] "No participaré"
msgstr[1] "No participaré"
-#: ../../include/conversation.php:1733
+#: ../../include/conversation.php:1743
msgctxt "noun"
msgid "Undecided"
msgid_plural "Undecided"
msgstr[0] "Indeciso/a"
msgstr[1] "Indecisos/as"
-#: ../../include/conversation.php:1736
+#: ../../include/conversation.php:1746
msgctxt "noun"
msgid "Agree"
msgid_plural "Agrees"
msgstr[0] "De acuerdo"
msgstr[1] "De acuerdo"
-#: ../../include/conversation.php:1739
+#: ../../include/conversation.php:1749
msgctxt "noun"
msgid "Disagree"
msgid_plural "Disagrees"
msgstr[0] "En desacuerdo"
msgstr[1] "En desacuerdo"
-#: ../../include/conversation.php:1742
+#: ../../include/conversation.php:1752
msgctxt "noun"
msgid "Abstain"
msgid_plural "Abstains"
@@ -1738,6 +1574,10 @@ msgstr "AAAA-MM-DD o MM-DD"
msgid "Required"
msgstr "Obligatorio"
+#: ../../include/datetime.php:263 ../../boot.php:2330
+msgid "never"
+msgstr "nunca"
+
#: ../../include/datetime.php:269
msgid "less than a second ago"
msgstr "hace un instante"
@@ -1827,6 +1667,31 @@ msgstr "Opciones del directorio"
msgid "Safe Mode"
msgstr "Modo seguro"
+#: ../../include/dir_fns.php:141 ../../include/dir_fns.php:142
+#: ../../include/dir_fns.php:143 ../../mod/admin.php:421 ../../mod/api.php:102
+#: ../../mod/connedit.php:644 ../../mod/connedit.php:693
+#: ../../mod/events.php:447 ../../mod/events.php:448 ../../mod/events.php:457
+#: ../../mod/filestorage.php:151 ../../mod/filestorage.php:159
+#: ../../mod/menu.php:96 ../../mod/menu.php:153 ../../mod/mitem.php:154
+#: ../../mod/mitem.php:155 ../../mod/mitem.php:228 ../../mod/mitem.php:229
+#: ../../mod/photos.php:626 ../../mod/removeme.php:60
+#: ../../mod/settings.php:577 ../../view/theme/redbasic/php/config.php:104
+#: ../../view/theme/redbasic/php/config.php:129 ../../boot.php:1512
+msgid "No"
+msgstr "No"
+
+#: ../../include/dir_fns.php:141 ../../include/dir_fns.php:142
+#: ../../include/dir_fns.php:143 ../../mod/admin.php:423 ../../mod/api.php:101
+#: ../../mod/events.php:447 ../../mod/events.php:448 ../../mod/events.php:457
+#: ../../mod/filestorage.php:151 ../../mod/filestorage.php:159
+#: ../../mod/menu.php:96 ../../mod/menu.php:153 ../../mod/mitem.php:154
+#: ../../mod/mitem.php:155 ../../mod/mitem.php:228 ../../mod/mitem.php:229
+#: ../../mod/photos.php:626 ../../mod/removeme.php:60
+#: ../../mod/settings.php:577 ../../view/theme/redbasic/php/config.php:104
+#: ../../view/theme/redbasic/php/config.php:129 ../../boot.php:1512
+msgid "Yes"
+msgstr "Sí"
+
#: ../../include/dir_fns.php:142
msgid "Public Forums Only"
msgstr "Solo foros públicos"
@@ -2055,274 +1920,6 @@ msgstr "En proceso"
msgid "Cancelled"
msgstr "Cancelado/a"
-#: ../../include/features.php:45
-msgid "General Features"
-msgstr "Funcionalidades básicas"
-
-#: ../../include/features.php:47
-msgid "Content Expiration"
-msgstr "Caducidad del contenido"
-
-#: ../../include/features.php:47
-msgid "Remove posts/comments and/or private messages at a future time"
-msgstr "Eliminar publicaciones/comentarios y/o mensajes privados más adelante"
-
-#: ../../include/features.php:48
-msgid "Multiple Profiles"
-msgstr "Múltiples perfiles"
-
-#: ../../include/features.php:48
-msgid "Ability to create multiple profiles"
-msgstr "Capacidad de crear múltiples perfiles"
-
-#: ../../include/features.php:49
-msgid "Advanced Profiles"
-msgstr "Perfiles avanzados"
-
-#: ../../include/features.php:49
-msgid "Additional profile sections and selections"
-msgstr "Secciones y selecciones de perfil adicionales"
-
-#: ../../include/features.php:50
-msgid "Profile Import/Export"
-msgstr "Importar/Exportar perfil"
-
-#: ../../include/features.php:50
-msgid "Save and load profile details across sites/channels"
-msgstr "Guardar y cargar detalles del perfil a través de sitios/canales"
-
-#: ../../include/features.php:51
-msgid "Web Pages"
-msgstr "Páginas web"
-
-#: ../../include/features.php:51
-msgid "Provide managed web pages on your channel"
-msgstr "Proveer páginas web gestionadas en su canal"
-
-#: ../../include/features.php:52
-msgid "Private Notes"
-msgstr "Notas privadas"
-
-#: ../../include/features.php:52
-msgid "Enables a tool to store notes and reminders"
-msgstr "Activar una herramienta para almacenar notas y recordatorios"
-
-#: ../../include/features.php:53
-msgid "Navigation Channel Select"
-msgstr "Navegación por el selector de canales"
-
-#: ../../include/features.php:53
-msgid "Change channels directly from within the navigation dropdown menu"
-msgstr "Cambiar de canales directamente desde el menú de navegación desplegable"
-
-#: ../../include/features.php:54
-msgid "Photo Location"
-msgstr "Ubicación de las fotos"
-
-#: ../../include/features.php:54
-msgid "If location data is available on uploaded photos, link this to a map."
-msgstr "Si los datos de ubicación están disponibles en las fotos subidas, enlazar estas a un mapa."
-
-#: ../../include/features.php:56
-msgid "Expert Mode"
-msgstr "Modo de experto"
-
-#: ../../include/features.php:56
-msgid "Enable Expert Mode to provide advanced configuration options"
-msgstr "Habilitar el modo de experto para acceder a opciones avanzadas de configuración"
-
-#: ../../include/features.php:57
-msgid "Premium Channel"
-msgstr "Canal premium"
-
-#: ../../include/features.php:57
-msgid ""
-"Allows you to set restrictions and terms on those that connect with your "
-"channel"
-msgstr "Les permite configurar restricciones y normas de uso a aquellos que conectan con su canal"
-
-#: ../../include/features.php:62
-msgid "Post Composition Features"
-msgstr "Opciones para la redacción de entradas"
-
-#: ../../include/features.php:64
-msgid "Use Markdown"
-msgstr "Usar Markdown"
-
-#: ../../include/features.php:64
-msgid "Allow use of \"Markdown\" to format posts"
-msgstr "Permitir el uso de \"Markdown\" para formatear publicaciones"
-
-#: ../../include/features.php:65
-msgid "Large Photos"
-msgstr "Fotos de gran tamaño"
-
-#: ../../include/features.php:65
-msgid ""
-"Include large (1024px) photo thumbnails in posts. If not enabled, use small "
-"(640px) photo thumbnails"
-msgstr "Incluir miniaturas de fotos grandes (1024px) en publicaciones. Si no está habilitado, usar miniaturas pequeñas (640px)"
-
-#: ../../include/features.php:66 ../../include/widgets.php:549
-#: ../../mod/sources.php:88
-msgid "Channel Sources"
-msgstr "Orígenes de los contenidos del canal"
-
-#: ../../include/features.php:66
-msgid "Automatically import channel content from other channels or feeds"
-msgstr "Importar automáticamente contenido de otros canales o \"feeds\""
-
-#: ../../include/features.php:67
-msgid "Even More Encryption"
-msgstr "Más cifrado todavía"
-
-#: ../../include/features.php:67
-msgid ""
-"Allow optional encryption of content end-to-end with a shared secret key"
-msgstr "Permitir cifrado adicional de contenido \"punto-a-punto\" con una clave secreta compartida."
-
-#: ../../include/features.php:68
-msgid "Enable Voting Tools"
-msgstr "Permitir entradas con votación"
-
-#: ../../include/features.php:68
-msgid "Provide a class of post which others can vote on"
-msgstr "Proveer una clase de publicación en la que otros puedan votar"
-
-#: ../../include/features.php:69
-msgid "Delayed Posting"
-msgstr "Publicación aplazada"
-
-#: ../../include/features.php:69
-msgid "Allow posts to be published at a later date"
-msgstr "Permitir mensajes que se publicarán en una fecha posterior"
-
-#: ../../include/features.php:70
-msgid "Suppress Duplicate Posts/Comments"
-msgstr "Prevenir entradas o comentarios duplicados"
-
-#: ../../include/features.php:70
-msgid ""
-"Prevent posts with identical content to be published with less than two "
-"minutes in between submissions."
-msgstr "Prevenir que entradas con contenido idéntico se publiquen con menos de dos minutos de intervalo."
-
-#: ../../include/features.php:76
-msgid "Network and Stream Filtering"
-msgstr "Filtrado del contenido"
-
-#: ../../include/features.php:77
-msgid "Search by Date"
-msgstr "Buscar por fecha"
-
-#: ../../include/features.php:77
-msgid "Ability to select posts by date ranges"
-msgstr "Capacidad de seleccionar entradas por rango de fechas"
-
-#: ../../include/features.php:78
-msgid "Collections Filter"
-msgstr "Filtrado de colecciones"
-
-#: ../../include/features.php:78
-msgid "Enable widget to display Network posts only from selected collections"
-msgstr "Habilitar la muestra de entradas eligiendo colecciones"
-
-#: ../../include/features.php:79 ../../include/widgets.php:274
-msgid "Saved Searches"
-msgstr "Búsquedas guardadas"
-
-#: ../../include/features.php:79
-msgid "Save search terms for re-use"
-msgstr "Guardar términos de búsqueda para su reutilización"
-
-#: ../../include/features.php:80
-msgid "Network Personal Tab"
-msgstr "Actividad personal"
-
-#: ../../include/features.php:80
-msgid "Enable tab to display only Network posts that you've interacted on"
-msgstr "Habilitar una pestaña en la cual se muestren solo las entradas en las que ha participado."
-
-#: ../../include/features.php:81
-msgid "Network New Tab"
-msgstr "Contenido nuevo"
-
-#: ../../include/features.php:81
-msgid "Enable tab to display all new Network activity"
-msgstr "Habilitar una pestaña en la que se muestre solo el contenido nuevo"
-
-#: ../../include/features.php:82
-msgid "Affinity Tool"
-msgstr "Herramienta de afinidad"
-
-#: ../../include/features.php:82
-msgid "Filter stream activity by depth of relationships"
-msgstr "Filtrar el contenido según la profundidad de las relaciones"
-
-#: ../../include/features.php:83
-msgid "Connection Filtering"
-msgstr "Filtrado de conexiones"
-
-#: ../../include/features.php:83
-msgid "Filter incoming posts from connections based on keywords/content"
-msgstr "Filtrar publicaciones entrantes de conexiones por palabras clave o contenido"
-
-#: ../../include/features.php:84
-msgid "Suggest Channels"
-msgstr "Sugerir canales"
-
-#: ../../include/features.php:84
-msgid "Show channel suggestions"
-msgstr "Mostrar sugerencias de canales"
-
-#: ../../include/features.php:89
-msgid "Post/Comment Tools"
-msgstr "Gestión de entradas y comentarios"
-
-#: ../../include/features.php:90
-msgid "Community Tagging"
-msgstr "Etiquetas de la comunidad"
-
-#: ../../include/features.php:90
-msgid "Ability to tag existing posts"
-msgstr "Capacidad de etiquetar entradas existentes"
-
-#: ../../include/features.php:91
-msgid "Post Categories"
-msgstr "Categorías de entradas"
-
-#: ../../include/features.php:91
-msgid "Add categories to your posts"
-msgstr "Añadir categorías a sus publicaciones"
-
-#: ../../include/features.php:92
-msgid "Ability to file posts under folders"
-msgstr "Capacidad de archivar entradas en carpetas"
-
-#: ../../include/features.php:93
-msgid "Dislike Posts"
-msgstr "Desagrado de publicaciones"
-
-#: ../../include/features.php:93
-msgid "Ability to dislike posts/comments"
-msgstr "Capacidad de mostrar desacuerdo con el contenido de entradas y comentarios"
-
-#: ../../include/features.php:94
-msgid "Star Posts"
-msgstr "Entradas destacadas"
-
-#: ../../include/features.php:94
-msgid "Ability to mark special posts with a star indicator"
-msgstr "Capacidad de marcar entradas destacadas con un indicador de estrella"
-
-#: ../../include/features.php:95
-msgid "Tag Cloud"
-msgstr "Nube de etiquetas"
-
-#: ../../include/features.php:95
-msgid "Provide a personal tag cloud on your channel page"
-msgstr "Proveer nube de etiquetas personal en su página de canal"
-
#: ../../include/follow.php:28
msgid "Channel is blocked on this site."
msgstr "El canal está bloqueado en este sitio."
@@ -2394,257 +1991,6 @@ msgstr "El canal no se encuentra en ninguna colección"
msgid "add"
msgstr "añadir"
-#: ../../include/identity.php:32
-msgid "Unable to obtain identity information from database"
-msgstr "No ha sido posible obtener información sobre la identidad desde la base de datos"
-
-#: ../../include/identity.php:66
-msgid "Empty name"
-msgstr "Nombre vacío"
-
-#: ../../include/identity.php:69
-msgid "Name too long"
-msgstr "Nombre demasiado largo"
-
-#: ../../include/identity.php:181
-msgid "No account identifier"
-msgstr "Ningún identificador de la cuenta"
-
-#: ../../include/identity.php:193
-msgid "Nickname is required."
-msgstr "Se requiere un sobrenombre (alias)."
-
-#: ../../include/identity.php:207
-msgid "Reserved nickname. Please choose another."
-msgstr "Sobrenombre en uso. Por favor, elija otro."
-
-#: ../../include/identity.php:212
-msgid ""
-"Nickname has unsupported characters or is already being used on this site."
-msgstr "El alias contiene caracteres no admitidos o está ya en uso por otros usuarios de este sitio."
-
-#: ../../include/identity.php:288
-msgid "Unable to retrieve created identity"
-msgstr "No ha sido posible recuperar la identidad creada"
-
-#: ../../include/identity.php:346
-msgid "Default Profile"
-msgstr "Perfil principal"
-
-#: ../../include/identity.php:390 ../../include/identity.php:391
-#: ../../include/identity.php:398 ../../include/profile_selectors.php:80
-#: ../../include/widgets.php:430 ../../mod/settings.php:338
-#: ../../mod/settings.php:342 ../../mod/settings.php:343
-#: ../../mod/settings.php:346 ../../mod/settings.php:357
-#: ../../mod/connedit.php:582
-msgid "Friends"
-msgstr "Amigos/as"
-
-#: ../../include/identity.php:770
-msgid "Requested channel is not available."
-msgstr "El canal solicitado no está disponible."
-
-#: ../../include/identity.php:816 ../../mod/achievements.php:11
-#: ../../mod/blocks.php:29 ../../mod/connect.php:13 ../../mod/editblock.php:29
-#: ../../mod/editlayout.php:27 ../../mod/editwebpage.php:28
-#: ../../mod/filestorage.php:54 ../../mod/hcard.php:8 ../../mod/layouts.php:29
-#: ../../mod/profile.php:16 ../../mod/webpages.php:29
-msgid "Requested profile is not available."
-msgstr "El perfil solicitado no está disponible."
-
-#: ../../include/identity.php:960 ../../mod/profiles.php:782
-msgid "Change profile photo"
-msgstr "Cambiar la foto del perfil"
-
-#: ../../include/identity.php:966
-msgid "Profiles"
-msgstr "Perfiles"
-
-#: ../../include/identity.php:966
-msgid "Manage/edit profiles"
-msgstr "Administrar/editar perfiles"
-
-#: ../../include/identity.php:967 ../../mod/profiles.php:783
-msgid "Create New Profile"
-msgstr "Crear un nuevo perfil"
-
-#: ../../include/identity.php:970 ../../include/nav.php:90
-msgid "Edit Profile"
-msgstr "Editar el perfil"
-
-#: ../../include/identity.php:982 ../../mod/profiles.php:794
-msgid "Profile Image"
-msgstr "Imagen del perfil"
-
-#: ../../include/identity.php:985
-msgid "visible to everybody"
-msgstr "visible para cualquiera"
-
-#: ../../include/identity.php:986 ../../mod/profiles.php:677
-#: ../../mod/profiles.php:798
-msgid "Edit visibility"
-msgstr "Editar visibilidad"
-
-#: ../../include/identity.php:1002 ../../include/identity.php:1242
-msgid "Gender:"
-msgstr "Género:"
-
-#: ../../include/identity.php:1003 ../../include/identity.php:1286
-msgid "Status:"
-msgstr "Estado:"
-
-#: ../../include/identity.php:1004 ../../include/identity.php:1297
-msgid "Homepage:"
-msgstr "Página personal:"
-
-#: ../../include/identity.php:1005
-msgid "Online Now"
-msgstr "Ahora en línea"
-
-#: ../../include/identity.php:1089 ../../include/identity.php:1167
-#: ../../mod/ping.php:318
-msgid "g A l F d"
-msgstr "g A l d F"
-
-#: ../../include/identity.php:1090 ../../include/identity.php:1168
-msgid "F d"
-msgstr "d F"
-
-#: ../../include/identity.php:1135 ../../include/identity.php:1207
-#: ../../mod/ping.php:341
-msgid "[today]"
-msgstr "[hoy]"
-
-#: ../../include/identity.php:1146
-msgid "Birthday Reminders"
-msgstr "Recordatorios de cumpleaños"
-
-#: ../../include/identity.php:1147
-msgid "Birthdays this week:"
-msgstr "Cumpleaños de esta semana:"
-
-#: ../../include/identity.php:1200
-msgid "[No description]"
-msgstr "[Sin descripción]"
-
-#: ../../include/identity.php:1218
-msgid "Event Reminders"
-msgstr "Recordatorios de eventos"
-
-#: ../../include/identity.php:1219
-msgid "Events this week:"
-msgstr "Eventos de esta semana:"
-
-#: ../../include/identity.php:1240 ../../mod/settings.php:1029
-msgid "Full Name:"
-msgstr "Nombre completo:"
-
-#: ../../include/identity.php:1247
-msgid "Like this channel"
-msgstr "Me gusta este canal"
-
-#: ../../include/identity.php:1271
-msgid "j F, Y"
-msgstr "j F Y"
-
-#: ../../include/identity.php:1272
-msgid "j F"
-msgstr "j F"
-
-#: ../../include/identity.php:1279
-msgid "Birthday:"
-msgstr "Cumpleaños:"
-
-#: ../../include/identity.php:1283 ../../mod/directory.php:299
-msgid "Age:"
-msgstr "Edad:"
-
-#: ../../include/identity.php:1292
-#, php-format
-msgid "for %1$d %2$s"
-msgstr "por %1$d %2$s"
-
-#: ../../include/identity.php:1295 ../../mod/profiles.php:699
-msgid "Sexual Preference:"
-msgstr "Orientación sexual:"
-
-#: ../../include/identity.php:1299 ../../mod/directory.php:315
-#: ../../mod/profiles.php:701
-msgid "Hometown:"
-msgstr "Ciudad de origen:"
-
-#: ../../include/identity.php:1301
-msgid "Tags:"
-msgstr "Etiquetas:"
-
-#: ../../include/identity.php:1303 ../../mod/profiles.php:702
-msgid "Political Views:"
-msgstr "Posición política:"
-
-#: ../../include/identity.php:1305
-msgid "Religion:"
-msgstr "Religión:"
-
-#: ../../include/identity.php:1307 ../../mod/directory.php:317
-msgid "About:"
-msgstr "Sobre mí:"
-
-#: ../../include/identity.php:1309
-msgid "Hobbies/Interests:"
-msgstr "Aficciones/Intereses:"
-
-#: ../../include/identity.php:1311 ../../mod/profiles.php:705
-msgid "Likes:"
-msgstr "Me gusta:"
-
-#: ../../include/identity.php:1313 ../../mod/profiles.php:706
-msgid "Dislikes:"
-msgstr "No me gusta:"
-
-#: ../../include/identity.php:1315
-msgid "Contact information and Social Networks:"
-msgstr "Información de contacto y redes sociales:"
-
-#: ../../include/identity.php:1317
-msgid "My other channels:"
-msgstr "Mis otros canales:"
-
-#: ../../include/identity.php:1319
-msgid "Musical interests:"
-msgstr "Intereses musicales:"
-
-#: ../../include/identity.php:1321
-msgid "Books, literature:"
-msgstr "Libros, literatura:"
-
-#: ../../include/identity.php:1323
-msgid "Television:"
-msgstr "Televisión:"
-
-#: ../../include/identity.php:1325
-msgid "Film/dance/culture/entertainment:"
-msgstr "Cine/danza/cultura/entretenimiento:"
-
-#: ../../include/identity.php:1327
-msgid "Love/Romance:"
-msgstr "Vida sentimental/amorosa:"
-
-#: ../../include/identity.php:1329
-msgid "Work/employment:"
-msgstr "Trabajo:"
-
-#: ../../include/identity.php:1331
-msgid "School/education:"
-msgstr "Estudios:"
-
-#: ../../include/identity.php:1351
-msgid "Like this thing"
-msgstr "Me gusta esto"
-
-#: ../../include/identity.php:1759 ../../mod/cover_photo.php:236
-msgid "cover photo"
-msgstr "Imagen de portada del perfil"
-
#: ../../include/import.php:23
msgid ""
"Cannot create a duplicate channel identifier on this system. Import failed."
@@ -2658,79 +2004,6 @@ msgstr "La clonación del canal no ha salido bien. La importación ha fallado."
msgid "Cloned channel not found. Import failed."
msgstr "No se ha podido importar el canal porque el canal clonado no se ha encontrado."
-#: ../../include/items.php:423 ../../index.php:366 ../../mod/dreport.php:6
-#: ../../mod/dreport.php:45 ../../mod/group.php:68
-#: ../../mod/import_items.php:114 ../../mod/like.php:280
-#: ../../mod/profperm.php:23 ../../mod/subthread.php:58
-msgid "Permission denied"
-msgstr "Permiso denegado"
-
-#: ../../include/items.php:1130 ../../include/items.php:1176
-msgid "(Unknown)"
-msgstr "(Desconocido)"
-
-#: ../../include/items.php:1373
-msgid "Visible to anybody on the internet."
-msgstr "Visible para cualquiera en internet."
-
-#: ../../include/items.php:1375
-msgid "Visible to you only."
-msgstr "Visible sólo para usted."
-
-#: ../../include/items.php:1377
-msgid "Visible to anybody in this network."
-msgstr "Visible para cualquiera en esta red."
-
-#: ../../include/items.php:1379
-msgid "Visible to anybody authenticated."
-msgstr "Visible para cualquiera que haya sido autenticado."
-
-#: ../../include/items.php:1381
-#, php-format
-msgid "Visible to anybody on %s."
-msgstr "Visible para cualquiera en %s."
-
-#: ../../include/items.php:1383
-msgid "Visible to all connections."
-msgstr "Visible para todas las conexiones."
-
-#: ../../include/items.php:1385
-msgid "Visible to approved connections."
-msgstr "Visible para las conexiones permitidas."
-
-#: ../../include/items.php:1387
-msgid "Visible to specific connections."
-msgstr "Visible para conexiones específicas."
-
-#: ../../include/items.php:4326 ../../mod/admin.php:135
-#: ../../mod/admin.php:1091 ../../mod/admin.php:1336 ../../mod/display.php:36
-#: ../../mod/filestorage.php:27 ../../mod/thing.php:86
-#: ../../mod/viewsrc.php:20
-msgid "Item not found."
-msgstr "Elemento no encontrado."
-
-#: ../../include/items.php:4838 ../../mod/group.php:38 ../../mod/group.php:137
-msgid "Collection not found."
-msgstr "Colección no encontrada."
-
-#: ../../include/items.php:4854
-msgid "Collection is empty."
-msgstr "La colección está vacía."
-
-#: ../../include/items.php:4861
-#, php-format
-msgid "Collection: %s"
-msgstr "Colección: %s"
-
-#: ../../include/items.php:4871 ../../mod/connedit.php:692
-#, php-format
-msgid "Connection: %s"
-msgstr "Conexión: %s"
-
-#: ../../include/items.php:4873
-msgid "Connection not found."
-msgstr "Conexión no encontrada"
-
#: ../../include/js_strings.php:5
msgid "Delete this item?"
msgstr "¿Borrar este elemento?"
@@ -2783,8 +2056,8 @@ msgstr "Nada nuevo por aquí"
msgid "Rate This Channel (this is public)"
msgstr "Valorar este canal (esto es público)"
-#: ../../include/js_strings.php:20 ../../mod/rate.php:157
-#: ../../mod/connedit.php:703
+#: ../../include/js_strings.php:20 ../../mod/connedit.php:703
+#: ../../mod/rate.php:157
msgid "Rating"
msgstr "Valoración"
@@ -3073,6 +2346,10 @@ msgstr "No ha sido posible determinar el remitente. "
msgid "Stored post could not be verified."
msgstr "No se han podido verificar las publicaciones guardadas."
+#: ../../include/nav.php:82 ../../include/nav.php:114 ../../boot.php:1507
+msgid "Logout"
+msgstr "Finalizar sesión"
+
#: ../../include/nav.php:82 ../../include/nav.php:114
msgid "End this session"
msgstr "Finalizar esta sesión"
@@ -3097,6 +2374,10 @@ msgstr "Editar perfiles"
msgid "Manage/Edit profiles"
msgstr "Administrar/editar perfiles"
+#: ../../include/nav.php:90 ../../include/identity.php:972
+msgid "Edit Profile"
+msgstr "Editar el perfil"
+
#: ../../include/nav.php:90
msgid "Edit your profile"
msgstr "Editar su perfil"
@@ -3142,6 +2423,10 @@ msgstr "Pulsar para identificarse en su servidor de inicio"
msgid "Home Page"
msgstr "Página de inicio"
+#: ../../include/nav.php:149 ../../mod/register.php:264 ../../boot.php:1490
+msgid "Register"
+msgstr "Registrarse"
+
#: ../../include/nav.php:149
msgid "Create an account"
msgstr "Crear una cuenta"
@@ -3183,7 +2468,8 @@ msgstr "Mi canal"
msgid "Mark all channel notifications seen"
msgstr "Marcar todas las notificaciones del canal como leídas"
-#: ../../include/nav.php:181 ../../mod/connections.php:293
+#: ../../include/nav.php:181 ../../include/text.php:815
+#: ../../mod/connections.php:296
msgid "Connections"
msgstr "Conexiones"
@@ -3247,7 +2533,7 @@ msgstr "Gestionar sus canales"
msgid "Account/Channel Settings"
msgstr "Ajustes de cuenta/canales"
-#: ../../include/nav.php:210 ../../include/widgets.php:1279
+#: ../../include/nav.php:210 ../../include/widgets.php:1281
msgid "Admin"
msgstr "Administrador"
@@ -3267,7 +2553,7 @@ msgstr "Espere por favor…"
msgid "view full size"
msgstr "Ver en el tamaño original"
-#: ../../include/network.php:1673
+#: ../../include/network.php:1674
msgid "No Subject"
msgstr "Sin asunto"
@@ -3633,6 +2919,15 @@ msgstr "Infiel"
msgid "Sex Addict"
msgstr "Con adicción al sexo"
+#: ../../include/profile_selectors.php:80 ../../include/identity.php:390
+#: ../../include/identity.php:391 ../../include/identity.php:398
+#: ../../include/widgets.php:430 ../../mod/connedit.php:582
+#: ../../mod/settings.php:338 ../../mod/settings.php:342
+#: ../../mod/settings.php:343 ../../mod/settings.php:346
+#: ../../mod/settings.php:357
+msgid "Friends"
+msgstr "Amigos/as"
+
#: ../../include/profile_selectors.php:80
msgid "Friends/Benefits"
msgstr "Amigos con algo extra"
@@ -3723,7 +3018,7 @@ msgstr "No me importa"
msgid "Ask me"
msgstr "Pregúnteme"
-#: ../../include/security.php:381
+#: ../../include/security.php:384
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."
@@ -3761,6 +3056,605 @@ msgstr "gusta de"
msgid "dislikes"
msgstr "no gusta de"
+#: ../../include/zot.php:676
+msgid "Invalid data packet"
+msgstr "Paquete de datos no válido"
+
+#: ../../include/zot.php:692
+msgid "Unable to verify channel signature"
+msgstr "No ha sido posible de verificar la firma del canal"
+
+#: ../../include/zot.php:2268
+#, php-format
+msgid "Unable to verify site signature for %s"
+msgstr "No ha sido posible de verificar la firma del sitio para %s"
+
+#: ../../include/zot.php:3584
+msgid "invalid target signature"
+msgstr "La firma recibida no es válida"
+
+#: ../../include/contact_selectors.php:56
+msgid "Frequently"
+msgstr "Frecuentemente"
+
+#: ../../include/contact_selectors.php:57
+msgid "Hourly"
+msgstr "Cada hora"
+
+#: ../../include/contact_selectors.php:58
+msgid "Twice daily"
+msgstr "Dos veces al día"
+
+#: ../../include/contact_selectors.php:59
+msgid "Daily"
+msgstr "Diariamente"
+
+#: ../../include/contact_selectors.php:60
+msgid "Weekly"
+msgstr "Semanalmente"
+
+#: ../../include/contact_selectors.php:61
+msgid "Monthly"
+msgstr "Mensualmente"
+
+#: ../../include/contact_selectors.php:76
+msgid "Friendica"
+msgstr "Friendica"
+
+#: ../../include/contact_selectors.php:77
+msgid "OStatus"
+msgstr "OStatus"
+
+#: ../../include/contact_selectors.php:78
+msgid "RSS/Atom"
+msgstr "RSS/Atom"
+
+#: ../../include/contact_selectors.php:79 ../../mod/admin.php:891
+#: ../../mod/admin.php:900 ../../mod/id.php:15 ../../mod/id.php:16
+#: ../../boot.php:1510
+msgid "Email"
+msgstr "Correo electrónico"
+
+#: ../../include/contact_selectors.php:80
+msgid "Diaspora"
+msgstr "Diaspora"
+
+#: ../../include/contact_selectors.php:81
+msgid "Facebook"
+msgstr "Facebook"
+
+#: ../../include/contact_selectors.php:82
+msgid "Zot"
+msgstr "Zot"
+
+#: ../../include/contact_selectors.php:83
+msgid "LinkedIn"
+msgstr "LinkedIn"
+
+#: ../../include/contact_selectors.php:84
+msgid "XMPP/IM"
+msgstr "XMPP/IM"
+
+#: ../../include/contact_selectors.php:85
+msgid "MySpace"
+msgstr "MySpace"
+
+#: ../../include/features.php:45
+msgid "General Features"
+msgstr "Funcionalidades básicas"
+
+#: ../../include/features.php:47
+msgid "Content Expiration"
+msgstr "Caducidad del contenido"
+
+#: ../../include/features.php:47
+msgid "Remove posts/comments and/or private messages at a future time"
+msgstr "Eliminar publicaciones/comentarios y/o mensajes privados más adelante"
+
+#: ../../include/features.php:48
+msgid "Multiple Profiles"
+msgstr "Múltiples perfiles"
+
+#: ../../include/features.php:48
+msgid "Ability to create multiple profiles"
+msgstr "Capacidad de crear múltiples perfiles"
+
+#: ../../include/features.php:49
+msgid "Advanced Profiles"
+msgstr "Perfiles avanzados"
+
+#: ../../include/features.php:49
+msgid "Additional profile sections and selections"
+msgstr "Secciones y selecciones de perfil adicionales"
+
+#: ../../include/features.php:50
+msgid "Profile Import/Export"
+msgstr "Importar/Exportar perfil"
+
+#: ../../include/features.php:50
+msgid "Save and load profile details across sites/channels"
+msgstr "Guardar y cargar detalles del perfil a través de sitios/canales"
+
+#: ../../include/features.php:51
+msgid "Web Pages"
+msgstr "Páginas web"
+
+#: ../../include/features.php:51
+msgid "Provide managed web pages on your channel"
+msgstr "Proveer páginas web gestionadas en su canal"
+
+#: ../../include/features.php:52
+msgid "Hide Rating"
+msgstr "Ocultar las valoraciones"
+
+#: ../../include/features.php:52
+msgid ""
+"Hide the rating buttons on your channel and profile pages. Note: People can "
+"still rate you somewhere else."
+msgstr "Ocultar los botones de valoración en su canal y página de perfil. Tenga en cuenta, sin embargo, que la gente podrá expresar su valoración en otros lugares."
+
+#: ../../include/features.php:53
+msgid "Private Notes"
+msgstr "Notas privadas"
+
+#: ../../include/features.php:53
+msgid "Enables a tool to store notes and reminders"
+msgstr "Activar una herramienta para almacenar notas y recordatorios"
+
+#: ../../include/features.php:54
+msgid "Navigation Channel Select"
+msgstr "Navegación por el selector de canales"
+
+#: ../../include/features.php:54
+msgid "Change channels directly from within the navigation dropdown menu"
+msgstr "Cambiar de canales directamente desde el menú de navegación desplegable"
+
+#: ../../include/features.php:55
+msgid "Photo Location"
+msgstr "Ubicación de las fotos"
+
+#: ../../include/features.php:55
+msgid "If location data is available on uploaded photos, link this to a map."
+msgstr "Si los datos de ubicación están disponibles en las fotos subidas, enlazar estas a un mapa."
+
+#: ../../include/features.php:57
+msgid "Expert Mode"
+msgstr "Modo de experto"
+
+#: ../../include/features.php:57
+msgid "Enable Expert Mode to provide advanced configuration options"
+msgstr "Habilitar el modo de experto para acceder a opciones avanzadas de configuración"
+
+#: ../../include/features.php:58
+msgid "Premium Channel"
+msgstr "Canal premium"
+
+#: ../../include/features.php:58
+msgid ""
+"Allows you to set restrictions and terms on those that connect with your "
+"channel"
+msgstr "Le permite configurar restricciones y normas de uso a aquellos que conectan con su canal"
+
+#: ../../include/features.php:63
+msgid "Post Composition Features"
+msgstr "Opciones para la redacción de entradas"
+
+#: ../../include/features.php:65
+msgid "Use Markdown"
+msgstr "Usar Markdown"
+
+#: ../../include/features.php:65
+msgid "Allow use of \"Markdown\" to format posts"
+msgstr "Permitir el uso de \"Markdown\" para formatear publicaciones"
+
+#: ../../include/features.php:66
+msgid "Large Photos"
+msgstr "Fotos de gran tamaño"
+
+#: ../../include/features.php:66
+msgid ""
+"Include large (1024px) photo thumbnails in posts. If not enabled, use small "
+"(640px) photo thumbnails"
+msgstr "Incluir miniaturas de fotos grandes (1024px) en publicaciones. Si no está habilitado, usar miniaturas pequeñas (640px)"
+
+#: ../../include/features.php:67 ../../include/widgets.php:549
+#: ../../mod/sources.php:88
+msgid "Channel Sources"
+msgstr "Orígenes de los contenidos del canal"
+
+#: ../../include/features.php:67
+msgid "Automatically import channel content from other channels or feeds"
+msgstr "Importar automáticamente contenido de otros canales o \"feeds\""
+
+#: ../../include/features.php:68
+msgid "Even More Encryption"
+msgstr "Más cifrado todavía"
+
+#: ../../include/features.php:68
+msgid ""
+"Allow optional encryption of content end-to-end with a shared secret key"
+msgstr "Permitir cifrado adicional de contenido \"punto-a-punto\" con una clave secreta compartida."
+
+#: ../../include/features.php:69
+msgid "Enable Voting Tools"
+msgstr "Permitir entradas con votación"
+
+#: ../../include/features.php:69
+msgid "Provide a class of post which others can vote on"
+msgstr "Proveer una clase de publicación en la que otros puedan votar"
+
+#: ../../include/features.php:70
+msgid "Delayed Posting"
+msgstr "Publicación aplazada"
+
+#: ../../include/features.php:70
+msgid "Allow posts to be published at a later date"
+msgstr "Permitir mensajes que se publicarán en una fecha posterior"
+
+#: ../../include/features.php:71
+msgid "Suppress Duplicate Posts/Comments"
+msgstr "Prevenir entradas o comentarios duplicados"
+
+#: ../../include/features.php:71
+msgid ""
+"Prevent posts with identical content to be published with less than two "
+"minutes in between submissions."
+msgstr "Prevenir que entradas con contenido idéntico se publiquen con menos de dos minutos de intervalo."
+
+#: ../../include/features.php:77
+msgid "Network and Stream Filtering"
+msgstr "Filtrado del contenido"
+
+#: ../../include/features.php:78
+msgid "Search by Date"
+msgstr "Buscar por fecha"
+
+#: ../../include/features.php:78
+msgid "Ability to select posts by date ranges"
+msgstr "Capacidad de seleccionar entradas por rango de fechas"
+
+#: ../../include/features.php:79
+msgid "Collections (Privacy Groups)"
+msgstr "Colecciones (grupos privados)"
+
+#: ../../include/features.php:79
+msgid "Enable widget to display Network posts only from selected collections"
+msgstr "Habilitar la muestra de entradas eligiendo colecciones"
+
+#: ../../include/features.php:80 ../../include/widgets.php:274
+msgid "Saved Searches"
+msgstr "Búsquedas guardadas"
+
+#: ../../include/features.php:80
+msgid "Save search terms for re-use"
+msgstr "Guardar términos de búsqueda para su reutilización"
+
+#: ../../include/features.php:81
+msgid "Network Personal Tab"
+msgstr "Actividad personal"
+
+#: ../../include/features.php:81
+msgid "Enable tab to display only Network posts that you've interacted on"
+msgstr "Habilitar una pestaña en la cual se muestren solo las entradas en las que ha participado."
+
+#: ../../include/features.php:82
+msgid "Network New Tab"
+msgstr "Contenido nuevo"
+
+#: ../../include/features.php:82
+msgid "Enable tab to display all new Network activity"
+msgstr "Habilitar una pestaña en la que se muestre solo el contenido nuevo"
+
+#: ../../include/features.php:83
+msgid "Affinity Tool"
+msgstr "Herramienta de afinidad"
+
+#: ../../include/features.php:83
+msgid "Filter stream activity by depth of relationships"
+msgstr "Filtrar el contenido según la profundidad de las relaciones"
+
+#: ../../include/features.php:84
+msgid "Connection Filtering"
+msgstr "Filtrado de conexiones"
+
+#: ../../include/features.php:84
+msgid "Filter incoming posts from connections based on keywords/content"
+msgstr "Filtrar publicaciones entrantes de conexiones por palabras clave o contenido"
+
+#: ../../include/features.php:85
+msgid "Suggest Channels"
+msgstr "Sugerir canales"
+
+#: ../../include/features.php:85
+msgid "Show channel suggestions"
+msgstr "Mostrar sugerencias de canales"
+
+#: ../../include/features.php:90
+msgid "Post/Comment Tools"
+msgstr "Gestión de entradas y comentarios"
+
+#: ../../include/features.php:91
+msgid "Community Tagging"
+msgstr "Etiquetas de la comunidad"
+
+#: ../../include/features.php:91
+msgid "Ability to tag existing posts"
+msgstr "Capacidad de etiquetar entradas existentes"
+
+#: ../../include/features.php:92
+msgid "Post Categories"
+msgstr "Categorías de entradas"
+
+#: ../../include/features.php:92
+msgid "Add categories to your posts"
+msgstr "Añadir categorías a sus publicaciones"
+
+#: ../../include/features.php:93
+msgid "Ability to file posts under folders"
+msgstr "Capacidad de archivar entradas en carpetas"
+
+#: ../../include/features.php:94
+msgid "Dislike Posts"
+msgstr "Desagrado de publicaciones"
+
+#: ../../include/features.php:94
+msgid "Ability to dislike posts/comments"
+msgstr "Capacidad de mostrar desacuerdo con el contenido de entradas y comentarios"
+
+#: ../../include/features.php:95
+msgid "Star Posts"
+msgstr "Entradas destacadas"
+
+#: ../../include/features.php:95
+msgid "Ability to mark special posts with a star indicator"
+msgstr "Capacidad de marcar entradas destacadas con un indicador de estrella"
+
+#: ../../include/features.php:96
+msgid "Tag Cloud"
+msgstr "Nube de etiquetas"
+
+#: ../../include/features.php:96
+msgid "Provide a personal tag cloud on your channel page"
+msgstr "Proveer nube de etiquetas personal en su página de canal"
+
+#: ../../include/identity.php:32
+msgid "Unable to obtain identity information from database"
+msgstr "No ha sido posible obtener información sobre la identidad desde la base de datos"
+
+#: ../../include/identity.php:66
+msgid "Empty name"
+msgstr "Nombre vacío"
+
+#: ../../include/identity.php:69
+msgid "Name too long"
+msgstr "Nombre demasiado largo"
+
+#: ../../include/identity.php:181
+msgid "No account identifier"
+msgstr "Ningún identificador de la cuenta"
+
+#: ../../include/identity.php:193
+msgid "Nickname is required."
+msgstr "Se requiere un sobrenombre (alias)."
+
+#: ../../include/identity.php:207
+msgid "Reserved nickname. Please choose another."
+msgstr "Sobrenombre en uso. Por favor, elija otro."
+
+#: ../../include/identity.php:212
+msgid ""
+"Nickname has unsupported characters or is already being used on this site."
+msgstr "El alias contiene caracteres no admitidos o está ya en uso por otros usuarios de este sitio."
+
+#: ../../include/identity.php:288
+msgid "Unable to retrieve created identity"
+msgstr "No ha sido posible recuperar la identidad creada"
+
+#: ../../include/identity.php:346
+msgid "Default Profile"
+msgstr "Perfil principal"
+
+#: ../../include/identity.php:772
+msgid "Requested channel is not available."
+msgstr "El canal solicitado no está disponible."
+
+#: ../../include/identity.php:818 ../../mod/achievements.php:11
+#: ../../mod/blocks.php:29 ../../mod/connect.php:13 ../../mod/editblock.php:29
+#: ../../mod/editlayout.php:27 ../../mod/editwebpage.php:28
+#: ../../mod/filestorage.php:54 ../../mod/hcard.php:8 ../../mod/layouts.php:29
+#: ../../mod/profile.php:16 ../../mod/webpages.php:29
+msgid "Requested profile is not available."
+msgstr "El perfil solicitado no está disponible."
+
+#: ../../include/identity.php:962 ../../mod/profiles.php:782
+msgid "Change profile photo"
+msgstr "Cambiar la foto del perfil"
+
+#: ../../include/identity.php:968
+msgid "Profiles"
+msgstr "Perfiles"
+
+#: ../../include/identity.php:968
+msgid "Manage/edit profiles"
+msgstr "Administrar/editar perfiles"
+
+#: ../../include/identity.php:969 ../../mod/profiles.php:783
+msgid "Create New Profile"
+msgstr "Crear un nuevo perfil"
+
+#: ../../include/identity.php:984 ../../mod/profiles.php:794
+msgid "Profile Image"
+msgstr "Imagen del perfil"
+
+#: ../../include/identity.php:987
+msgid "visible to everybody"
+msgstr "visible para cualquiera"
+
+#: ../../include/identity.php:988 ../../mod/profiles.php:677
+#: ../../mod/profiles.php:798
+msgid "Edit visibility"
+msgstr "Editar visibilidad"
+
+#: ../../include/identity.php:1004 ../../include/identity.php:1246
+msgid "Gender:"
+msgstr "Género:"
+
+#: ../../include/identity.php:1005 ../../include/identity.php:1290
+msgid "Status:"
+msgstr "Estado:"
+
+#: ../../include/identity.php:1006 ../../include/identity.php:1301
+msgid "Homepage:"
+msgstr "Página personal:"
+
+#: ../../include/identity.php:1007
+msgid "Online Now"
+msgstr "Ahora en línea"
+
+#: ../../include/identity.php:1093 ../../include/identity.php:1171
+#: ../../mod/ping.php:318
+msgid "g A l F d"
+msgstr "g A l d F"
+
+#: ../../include/identity.php:1094 ../../include/identity.php:1172
+msgid "F d"
+msgstr "d F"
+
+#: ../../include/identity.php:1139 ../../include/identity.php:1211
+#: ../../mod/ping.php:341
+msgid "[today]"
+msgstr "[hoy]"
+
+#: ../../include/identity.php:1150
+msgid "Birthday Reminders"
+msgstr "Recordatorios de cumpleaños"
+
+#: ../../include/identity.php:1151
+msgid "Birthdays this week:"
+msgstr "Cumpleaños de esta semana:"
+
+#: ../../include/identity.php:1204
+msgid "[No description]"
+msgstr "[Sin descripción]"
+
+#: ../../include/identity.php:1222
+msgid "Event Reminders"
+msgstr "Recordatorios de eventos"
+
+#: ../../include/identity.php:1223
+msgid "Events this week:"
+msgstr "Eventos de esta semana:"
+
+#: ../../include/identity.php:1244 ../../mod/settings.php:1029
+msgid "Full Name:"
+msgstr "Nombre completo:"
+
+#: ../../include/identity.php:1251
+msgid "Like this channel"
+msgstr "Me gusta este canal"
+
+#: ../../include/identity.php:1275
+msgid "j F, Y"
+msgstr "j F Y"
+
+#: ../../include/identity.php:1276
+msgid "j F"
+msgstr "j F"
+
+#: ../../include/identity.php:1283
+msgid "Birthday:"
+msgstr "Cumpleaños:"
+
+#: ../../include/identity.php:1287 ../../mod/directory.php:299
+msgid "Age:"
+msgstr "Edad:"
+
+#: ../../include/identity.php:1296
+#, php-format
+msgid "for %1$d %2$s"
+msgstr "por %1$d %2$s"
+
+#: ../../include/identity.php:1299 ../../mod/profiles.php:699
+msgid "Sexual Preference:"
+msgstr "Orientación sexual:"
+
+#: ../../include/identity.php:1303 ../../mod/directory.php:315
+#: ../../mod/profiles.php:701
+msgid "Hometown:"
+msgstr "Ciudad de origen:"
+
+#: ../../include/identity.php:1305
+msgid "Tags:"
+msgstr "Etiquetas:"
+
+#: ../../include/identity.php:1307 ../../mod/profiles.php:702
+msgid "Political Views:"
+msgstr "Posición política:"
+
+#: ../../include/identity.php:1309
+msgid "Religion:"
+msgstr "Religión:"
+
+#: ../../include/identity.php:1311 ../../mod/directory.php:317
+msgid "About:"
+msgstr "Sobre mí:"
+
+#: ../../include/identity.php:1313
+msgid "Hobbies/Interests:"
+msgstr "Aficciones/Intereses:"
+
+#: ../../include/identity.php:1315 ../../mod/profiles.php:705
+msgid "Likes:"
+msgstr "Me gusta:"
+
+#: ../../include/identity.php:1317 ../../mod/profiles.php:706
+msgid "Dislikes:"
+msgstr "No me gusta:"
+
+#: ../../include/identity.php:1319
+msgid "Contact information and Social Networks:"
+msgstr "Información de contacto y redes sociales:"
+
+#: ../../include/identity.php:1321
+msgid "My other channels:"
+msgstr "Mis otros canales:"
+
+#: ../../include/identity.php:1323
+msgid "Musical interests:"
+msgstr "Intereses musicales:"
+
+#: ../../include/identity.php:1325
+msgid "Books, literature:"
+msgstr "Libros, literatura:"
+
+#: ../../include/identity.php:1327
+msgid "Television:"
+msgstr "Televisión:"
+
+#: ../../include/identity.php:1329
+msgid "Film/dance/culture/entertainment:"
+msgstr "Cine/danza/cultura/entretenimiento:"
+
+#: ../../include/identity.php:1331
+msgid "Love/Romance:"
+msgstr "Vida sentimental/amorosa:"
+
+#: ../../include/identity.php:1333
+msgid "Work/employment:"
+msgstr "Trabajo:"
+
+#: ../../include/identity.php:1335
+msgid "School/education:"
+msgstr "Estudios:"
+
+#: ../../include/identity.php:1355
+msgid "Like this thing"
+msgstr "Me gusta esto"
+
+#: ../../include/identity.php:1763 ../../mod/cover_photo.php:236
+msgid "cover photo"
+msgstr "Imagen de portada del perfil"
+
#: ../../include/text.php:394
msgid "prev"
msgstr "anterior"
@@ -3789,16 +3683,10 @@ msgstr "más recientes"
msgid "No connections"
msgstr "Sin conexiones"
-#: ../../include/text.php:815
+#: ../../include/text.php:828
#, php-format
-msgid "%d Connection"
-msgid_plural "%d Connections"
-msgstr[0] "%d Conexión"
-msgstr[1] "%d Conexiones"
-
-#: ../../include/text.php:828 ../../mod/viewconnections.php:101
-msgid "View Connections"
-msgstr "Ver conexiones"
+msgid "View all %s connections"
+msgstr "Ver todas las %s conexiones"
#: ../../include/text.php:886 ../../include/text.php:898
#: ../../include/widgets.php:192 ../../mod/admin.php:1568
@@ -4007,23 +3895,6 @@ msgstr "Formato gráfico"
msgid "Pages"
msgstr "Páginas"
-#: ../../include/zot.php:676
-msgid "Invalid data packet"
-msgstr "Paquete de datos no válido"
-
-#: ../../include/zot.php:692
-msgid "Unable to verify channel signature"
-msgstr "No ha sido posible de verificar la firma del canal"
-
-#: ../../include/zot.php:2268
-#, php-format
-msgid "Unable to verify site signature for %s"
-msgstr "No ha sido posible de verificar la firma del sitio para %s"
-
-#: ../../include/zot.php:3584
-msgid "invalid target signature"
-msgstr "La firma recibida no es válida"
-
#: ../../include/widgets.php:93
msgid "System"
msgstr "Sistema"
@@ -4214,107 +4085,184 @@ msgstr "Salas de chat sugeridas"
msgid "photo/image"
msgstr "foto/imagen"
-#: ../../include/widgets.php:1116 ../../include/widgets.php:1118
+#: ../../include/widgets.php:1115
+msgid "Rating Tools"
+msgstr "Valoraciones"
+
+#: ../../include/widgets.php:1119 ../../include/widgets.php:1121
msgid "Rate Me"
msgstr "Valorar este canal"
-#: ../../include/widgets.php:1122
+#: ../../include/widgets.php:1124
msgid "View Ratings"
msgstr "Mostrar las valoraciones"
-#: ../../include/widgets.php:1133
+#: ../../include/widgets.php:1135
msgid "Public Hubs"
msgstr "Servidores públicos"
-#: ../../include/widgets.php:1181
+#: ../../include/widgets.php:1183
msgid "Forums"
msgstr "Foros"
-#: ../../include/widgets.php:1210
+#: ../../include/widgets.php:1212
msgid "Tasks"
msgstr "Tareas"
-#: ../../include/widgets.php:1219
+#: ../../include/widgets.php:1221
msgid "Documentation"
msgstr "Documentación"
-#: ../../include/widgets.php:1221
+#: ../../include/widgets.php:1223
msgid "Project/Site Information"
msgstr "Información sobre el proyecto o sitio"
-#: ../../include/widgets.php:1222
+#: ../../include/widgets.php:1224
msgid "For Members"
msgstr "Para los usuarios"
-#: ../../include/widgets.php:1223
+#: ../../include/widgets.php:1225
msgid "For Administrators"
msgstr "Para los administradores"
-#: ../../include/widgets.php:1224
+#: ../../include/widgets.php:1226
msgid "For Developers"
msgstr "Para los desarrolladores"
-#: ../../include/widgets.php:1249 ../../mod/admin.php:452
+#: ../../include/widgets.php:1251 ../../mod/admin.php:452
msgid "Site"
msgstr "Sitio"
-#: ../../include/widgets.php:1250
+#: ../../include/widgets.php:1252
msgid "Accounts"
msgstr "Cuentas"
-#: ../../include/widgets.php:1251 ../../mod/admin.php:1051
+#: ../../include/widgets.php:1253 ../../mod/admin.php:1051
msgid "Channels"
msgstr "Canales"
-#: ../../include/widgets.php:1253 ../../mod/admin.php:1166
+#: ../../include/widgets.php:1255 ../../mod/admin.php:1166
#: ../../mod/admin.php:1227
msgid "Plugins"
msgstr "Extensiones"
-#: ../../include/widgets.php:1254 ../../mod/admin.php:1388
+#: ../../include/widgets.php:1256 ../../mod/admin.php:1388
#: ../../mod/admin.php:1422
msgid "Themes"
msgstr "Temas"
-#: ../../include/widgets.php:1255
+#: ../../include/widgets.php:1257
msgid "Inspect queue"
msgstr "Examinar la cola"
-#: ../../include/widgets.php:1256
+#: ../../include/widgets.php:1258
msgid "Profile Config"
msgstr "Ajustes del perfil"
-#: ../../include/widgets.php:1257
+#: ../../include/widgets.php:1259
msgid "DB updates"
msgstr "Actualizaciones de la base de datos"
-#: ../../include/widgets.php:1275 ../../include/widgets.php:1281
+#: ../../include/widgets.php:1277 ../../include/widgets.php:1283
#: ../../mod/admin.php:1507
msgid "Logs"
msgstr "Informes"
-#: ../../include/widgets.php:1280
+#: ../../include/widgets.php:1282
msgid "Plugin Features"
msgstr "Extensiones"
-#: ../../include/widgets.php:1282
+#: ../../include/widgets.php:1284
msgid "User registrations waiting for confirmation"
msgstr "Registros de usuarios pendientes de confirmación"
-#: ../../include/widgets.php:1360 ../../mod/photos.php:748
+#: ../../include/widgets.php:1362 ../../mod/photos.php:748
#: ../../mod/photos.php:1283
msgid "View Photo"
msgstr "Ver foto"
-#: ../../include/widgets.php:1377 ../../mod/photos.php:779
+#: ../../include/widgets.php:1379 ../../mod/photos.php:779
msgid "Edit Album"
msgstr "Editar álbum"
-#: ../../index.php:238 ../../mod/help.php:213
+#: ../../include/items.php:423 ../../index.php:370 ../../mod/dreport.php:6
+#: ../../mod/dreport.php:45 ../../mod/group.php:68
+#: ../../mod/import_items.php:108 ../../mod/like.php:280
+#: ../../mod/profperm.php:23 ../../mod/subthread.php:58
+msgid "Permission denied"
+msgstr "Permiso denegado"
+
+#: ../../include/items.php:1130 ../../include/items.php:1176
+msgid "(Unknown)"
+msgstr "(Desconocido)"
+
+#: ../../include/items.php:1373
+msgid "Visible to anybody on the internet."
+msgstr "Visible para cualquiera en internet."
+
+#: ../../include/items.php:1375
+msgid "Visible to you only."
+msgstr "Visible sólo para usted."
+
+#: ../../include/items.php:1377
+msgid "Visible to anybody in this network."
+msgstr "Visible para cualquiera en esta red."
+
+#: ../../include/items.php:1379
+msgid "Visible to anybody authenticated."
+msgstr "Visible para cualquiera que haya sido autenticado."
+
+#: ../../include/items.php:1381
+#, php-format
+msgid "Visible to anybody on %s."
+msgstr "Visible para cualquiera en %s."
+
+#: ../../include/items.php:1383
+msgid "Visible to all connections."
+msgstr "Visible para todas las conexiones."
+
+#: ../../include/items.php:1385
+msgid "Visible to approved connections."
+msgstr "Visible para las conexiones permitidas."
+
+#: ../../include/items.php:1387
+msgid "Visible to specific connections."
+msgstr "Visible para conexiones específicas."
+
+#: ../../include/items.php:4328 ../../mod/admin.php:135
+#: ../../mod/admin.php:1091 ../../mod/admin.php:1336 ../../mod/display.php:36
+#: ../../mod/filestorage.php:27 ../../mod/thing.php:86
+#: ../../mod/viewsrc.php:20
+msgid "Item not found."
+msgstr "Elemento no encontrado."
+
+#: ../../include/items.php:4840 ../../mod/group.php:38 ../../mod/group.php:137
+msgid "Collection not found."
+msgstr "Colección no encontrada."
+
+#: ../../include/items.php:4856
+msgid "Collection is empty."
+msgstr "La colección está vacía."
+
+#: ../../include/items.php:4863
+#, php-format
+msgid "Collection: %s"
+msgstr "Colección: %s"
+
+#: ../../include/items.php:4873 ../../mod/connedit.php:692
+#, php-format
+msgid "Connection: %s"
+msgstr "Conexión: %s"
+
+#: ../../include/items.php:4875
+msgid "Connection not found."
+msgstr "Conexión no encontrada"
+
+#: ../../index.php:242 ../../mod/help.php:213
msgid "Not Found"
msgstr "No encontrado"
-#: ../../index.php:241 ../../mod/block.php:75 ../../mod/display.php:110
+#: ../../index.php:245 ../../mod/block.php:75 ../../mod/display.php:110
#: ../../mod/help.php:216 ../../mod/page.php:89
msgid "Page not found."
msgstr "Página no encontrada."
@@ -4706,8 +4654,8 @@ msgid ""
msgstr "Carga máxima del sistema antes de que los procesos de transmisión y sondeo se hayan retardado - por defecto, 50."
#: ../../mod/admin.php:495
-msgid "Expiration period in days for imported (matrix/network) content"
-msgstr "Periodo de caducidad en días para el contenido importado (red)"
+msgid "Expiration period in days for imported (grid/network) content"
+msgstr "Caducidad del contenido importado de otros sitios (en días)"
#: ../../mod/admin.php:495
msgid "0 for no expiration of imported content"
@@ -4746,7 +4694,7 @@ msgstr "por canal"
msgid "on server"
msgstr "en el servidor"
-#: ../../mod/admin.php:618 ../../mod/connections.php:267
+#: ../../mod/admin.php:618 ../../mod/connections.php:266
msgid "Status"
msgstr "Estado"
@@ -4875,7 +4823,7 @@ msgstr "Fecha de solicitud"
msgid "No registrations."
msgstr "Sin registros."
-#: ../../mod/admin.php:893 ../../mod/connedit.php:719
+#: ../../mod/admin.php:893 ../../mod/connections.php:271
msgid "Approve"
msgstr "Aprobar"
@@ -5403,8 +5351,8 @@ msgid "Only show hidden connections"
msgstr "Mostrar solo las conexiones ocultas"
#: ../../mod/connections.php:234
-msgid "Pending"
-msgstr "Pendiente"
+msgid "Pending approval"
+msgstr "Pendiente de aprobación"
#: ../../mod/connections.php:250
#, php-format
@@ -5419,18 +5367,277 @@ msgstr "Editar conexión"
msgid "Delete connection"
msgstr "Eliminar conexión"
-#: ../../mod/connections.php:269
+#: ../../mod/connections.php:261
+msgid "Channel address"
+msgstr "Dirección del canal"
+
+#: ../../mod/connections.php:263
+msgid "Network"
+msgstr "Red"
+
+#: ../../mod/connections.php:268
msgid "Connected"
msgstr "Conectado/a"
-#: ../../mod/connections.php:298
+#: ../../mod/connections.php:270
+msgid "Approve connection"
+msgstr "Aprobar esta conexión"
+
+#: ../../mod/connections.php:272
+msgid "Recent activity"
+msgstr "Actividad reciente"
+
+#: ../../mod/connections.php:301
msgid "Search your connections"
msgstr "Buscar sus conexiones"
-#: ../../mod/connections.php:299
+#: ../../mod/connections.php:302
msgid "Connections search"
msgstr "Buscar conexiones"
+#: ../../mod/connedit.php:75
+msgid "Could not access contact record."
+msgstr "No se ha podido acceder al registro de contacto."
+
+#: ../../mod/connedit.php:99
+msgid "Could not locate selected profile."
+msgstr "No se ha podido localizar el perfil seleccionado."
+
+#: ../../mod/connedit.php:223
+msgid "Connection updated."
+msgstr "Conexión actualizada."
+
+#: ../../mod/connedit.php:225
+msgid "Failed to update connection record."
+msgstr "Error al actualizar el registro de la conexión."
+
+#: ../../mod/connedit.php:272
+msgid "is now connected to"
+msgstr "ahora está conectado/a"
+
+#: ../../mod/connedit.php:398
+msgid "Could not access address book record."
+msgstr "No se pudo acceder al registro en su libreta de direcciones."
+
+#: ../../mod/connedit.php:412
+msgid "Refresh failed - channel is currently unavailable."
+msgstr "Recarga fallida - no se puede encontrar el canal en este momento."
+
+#: ../../mod/connedit.php:427 ../../mod/connedit.php:436
+#: ../../mod/connedit.php:445 ../../mod/connedit.php:454
+#: ../../mod/connedit.php:467
+msgid "Unable to set address book parameters."
+msgstr "No ha sido posible establecer los parámetros de la libreta de direcciones."
+
+#: ../../mod/connedit.php:491
+msgid "Connection has been removed."
+msgstr "La conexión ha sido eliminada."
+
+#: ../../mod/connedit.php:510
+#, php-format
+msgid "View %s's profile"
+msgstr "Ver el perfil de %s"
+
+#: ../../mod/connedit.php:514
+msgid "Refresh Permissions"
+msgstr "Recargar los permisos"
+
+#: ../../mod/connedit.php:517
+msgid "Fetch updated permissions"
+msgstr "Obtener los permisos actualizados"
+
+#: ../../mod/connedit.php:521
+msgid "Recent Activity"
+msgstr "Actividad reciente"
+
+#: ../../mod/connedit.php:524
+msgid "View recent posts and comments"
+msgstr "Ver publicaciones y comentarios recientes"
+
+#: ../../mod/connedit.php:531
+msgid "Block (or Unblock) all communications with this connection"
+msgstr "Bloquear (o desbloquear) todas las comunicaciones con esta conexión"
+
+#: ../../mod/connedit.php:532
+msgid "This connection is blocked!"
+msgstr "¡Esta conexión está bloqueada!"
+
+#: ../../mod/connedit.php:536
+msgid "Unignore"
+msgstr "Dejar de ignorar"
+
+#: ../../mod/connedit.php:536 ../../mod/notifications.php:51
+msgid "Ignore"
+msgstr "Ignorar"
+
+#: ../../mod/connedit.php:539
+msgid "Ignore (or Unignore) all inbound communications from this connection"
+msgstr "Ignorar (o dejar de ignorar) todas las comunicaciones entrantes de esta conexión"
+
+#: ../../mod/connedit.php:540
+msgid "This connection is ignored!"
+msgstr "¡Esta conexión es ignorada!"
+
+#: ../../mod/connedit.php:544
+msgid "Unarchive"
+msgstr "Desarchivar"
+
+#: ../../mod/connedit.php:544
+msgid "Archive"
+msgstr "Archivar"
+
+#: ../../mod/connedit.php:547
+msgid ""
+"Archive (or Unarchive) this connection - mark channel dead but keep content"
+msgstr "Archiva (o desarchiva) esta conexión - marca el canal como muerto aunque mantiene sus contenidos"
+
+#: ../../mod/connedit.php:548
+msgid "This connection is archived!"
+msgstr "¡Esta conexión esta archivada!"
+
+#: ../../mod/connedit.php:552
+msgid "Unhide"
+msgstr "Mostrar"
+
+#: ../../mod/connedit.php:552
+msgid "Hide"
+msgstr "Ocultar"
+
+#: ../../mod/connedit.php:555
+msgid "Hide or Unhide this connection from your other connections"
+msgstr "Ocultar o mostrar esta conexión a sus otras conexiones"
+
+#: ../../mod/connedit.php:556
+msgid "This connection is hidden!"
+msgstr "¡Esta conexión está oculta!"
+
+#: ../../mod/connedit.php:563
+msgid "Delete this connection"
+msgstr "Eliminar esta conexión"
+
+#: ../../mod/connedit.php:644
+msgid "Approve this connection"
+msgstr "Aprobar esta conexión"
+
+#: ../../mod/connedit.php:644
+msgid "Accept connection to allow communication"
+msgstr "Aceptar la conexión para permitir la comunicación"
+
+#: ../../mod/connedit.php:649
+msgid "Set Affinity"
+msgstr "Ajustar la afinidad"
+
+#: ../../mod/connedit.php:652
+msgid "Set Profile"
+msgstr "Ajustar el perfil"
+
+#: ../../mod/connedit.php:655
+msgid "Set Affinity & Profile"
+msgstr "Ajustar la afinidad y el perfil"
+
+#: ../../mod/connedit.php:688
+msgid "none"
+msgstr "-"
+
+#: ../../mod/connedit.php:693
+msgid "Apply these permissions automatically"
+msgstr "Aplicar estos permisos automaticamente"
+
+#: ../../mod/connedit.php:695
+msgid "This connection's primary address is"
+msgstr "La dirección primaria de esta conexión es"
+
+#: ../../mod/connedit.php:696
+msgid "Available locations:"
+msgstr "Ubicaciones disponibles:"
+
+#: ../../mod/connedit.php:700
+msgid ""
+"The permissions indicated on this page will be applied to all new "
+"connections."
+msgstr "Los permisos indicados en esta página serán aplicados en todas las nuevas conexiones."
+
+#: ../../mod/connedit.php:702
+msgid "Slide to adjust your degree of friendship"
+msgstr "Deslizar para ajustar el grado de amistad"
+
+#: ../../mod/connedit.php:704
+msgid "Slide to adjust your rating"
+msgstr "Deslizar para ajustar su valoración"
+
+#: ../../mod/connedit.php:705 ../../mod/connedit.php:710
+msgid "Optionally explain your rating"
+msgstr "Opcionalmente, puede explicar su valoración"
+
+#: ../../mod/connedit.php:707
+msgid "Custom Filter"
+msgstr "Filtro personalizado"
+
+#: ../../mod/connedit.php:708
+msgid "Only import posts with this text"
+msgstr "Importar solo entradas que contengan este texto"
+
+#: ../../mod/connedit.php:708 ../../mod/connedit.php:709
+msgid ""
+"words one per line or #tags or /patterns/ or lang=xx, leave blank to import "
+"all posts"
+msgstr "Una sola opción por línea: palabras, #etiquetas, /patrones/ o lang=xx. Dejar en blanco para importarlo todo"
+
+#: ../../mod/connedit.php:709
+msgid "Do not import posts with this text"
+msgstr "No importar entradas que contengan este texto"
+
+#: ../../mod/connedit.php:711
+msgid "This information is public!"
+msgstr "¡Esta información es pública!"
+
+#: ../../mod/connedit.php:716
+msgid "Connection Pending Approval"
+msgstr "Conexión pendiente de aprobación"
+
+#: ../../mod/connedit.php:719
+msgid "inherited"
+msgstr "heredado"
+
+#: ../../mod/connedit.php:721
+#, php-format
+msgid ""
+"Please choose the profile you would like to display to %s when viewing your "
+"profile securely."
+msgstr "Por favor, escoja el perfil que quiere mostrar a %s cuando esté viendo su perfil de forma segura."
+
+#: ../../mod/connedit.php:723
+msgid "Their Settings"
+msgstr "Sus ajustes"
+
+#: ../../mod/connedit.php:724
+msgid "My Settings"
+msgstr "Mis ajustes"
+
+#: ../../mod/connedit.php:726
+msgid "Individual Permissions"
+msgstr "Permisos individuales"
+
+#: ../../mod/connedit.php:727
+msgid ""
+"Some permissions may be inherited from your channel's <a "
+"href=\"settings\"><strong>privacy settings</strong></a>, which have higher "
+"priority than individual settings. You can <strong>not</strong> change those"
+" settings here."
+msgstr "Algunos permisos pueden ser heredados de los <a href=\"settings\"><strong>ajustes de privacidad</strong></a> de sus canales, los cuales tienen una prioridad más alta que los ajustes individuales. <strong>No</strong> puede cambiar estos ajustes aquí."
+
+#: ../../mod/connedit.php:728
+msgid ""
+"Some permissions may be inherited from your channel's <a "
+"href=\"settings\"><strong>privacy settings</strong></a>, which have higher "
+"priority than individual settings. You can change those settings here but "
+"they wont have any impact unless the inherited setting changes."
+msgstr "Algunos permisos pueden ser heredados de los <a href=\"settings\"><strong>ajustes de privacidad</strong></a> de sus canales, los cuales tienen una prioridad más alta que los ajustes individuales. Puede cambiar estos ajustes aquí, pero no tendrán ningún consecuencia hasta que cambie los ajustes heredados."
+
+#: ../../mod/connedit.php:729
+msgid "Last update:"
+msgstr "Última actualización:"
+
#: ../../mod/dav.php:121
msgid "$Projectname channel"
msgstr "Canal $Projectname"
@@ -5927,7 +6134,7 @@ msgstr "Búsqueda de Documentación"
msgid "Help:"
msgstr "Ayuda:"
-#: ../../mod/help.php:237
+#: ../../mod/help.php:239
msgid "$Projectname Documentation"
msgstr "Documentación de $Projectname"
@@ -6059,7 +6266,7 @@ msgid ""
"or provide an export file."
msgstr "Emplee este formulario para importar un canal desde un servidor/hub diferente. Puede recuperar el canal desde el antiguo servidor/hub a través de la red o proporcionando un fichero de exportación."
-#: ../../mod/import.php:516 ../../mod/import_items.php:121
+#: ../../mod/import.php:516 ../../mod/import_items.php:115
msgid "File to Upload"
msgstr "Fichero para subir"
@@ -6103,15 +6310,15 @@ msgid ""
"only once and leave this page open until finished."
msgstr "Este proceso puede tardar varios minutos en completarse. Por favor envíe el formulario una sola vez y mantenga esta página abierta hasta que termine."
-#: ../../mod/import_items.php:101
+#: ../../mod/import_items.php:98
msgid "Import completed"
msgstr "Importación completada"
-#: ../../mod/import_items.php:119
+#: ../../mod/import_items.php:113
msgid "Import Items"
msgstr "Importar elementos"
-#: ../../mod/import_items.php:120
+#: ../../mod/import_items.php:114
msgid ""
"Use this form to import existing posts and content from an export file."
msgstr "Utilice este formulario para importar entradas existentes y contenido desde un archivo de exportación."
@@ -6198,24 +6405,24 @@ msgstr "La entrada vacía ha sido desechada."
msgid "Executable content type not permitted to this channel."
msgstr "Contenido de tipo ejecutable no permitido en este canal."
-#: ../../mod/item.php:822
+#: ../../mod/item.php:824
msgid "Duplicate post suppressed."
msgstr "Se ha suprimido la entrada duplicada."
-#: ../../mod/item.php:953
+#: ../../mod/item.php:954
msgid "System error. Post not saved."
msgstr "Error del sistema. La entrada no se ha podido salvar."
-#: ../../mod/item.php:1220
+#: ../../mod/item.php:1221
msgid "Unable to obtain post information from database."
msgstr "No ha sido posible obtener información de la entrada en la base de datos."
-#: ../../mod/item.php:1227
+#: ../../mod/item.php:1228
#, php-format
msgid "You have reached your limit of %1$.0f top level posts."
msgstr "Ha alcanzado su límite de %1$.0f entradas en la página principal."
-#: ../../mod/item.php:1234
+#: ../../mod/item.php:1235
#, php-format
msgid "You have reached your limit of %1$.0f webpages."
msgstr "Ha alcanzado su límite de %1$.0f páginas web."
@@ -6364,75 +6571,6 @@ msgstr "Cuando sea posible, elimine una ubicación iniciando sesión en el sitio
msgid "Use this form to drop the location if the hub is no longer operating."
msgstr "Utilice este formulario para eliminar la dirección si el \"hub\" no está funcionando desde hace tiempo."
-#: ../../mod/lostpass.php:15
-msgid "No valid account found."
-msgstr "No se ha encontrado una cuenta válida."
-
-#: ../../mod/lostpass.php:29
-msgid "Password reset request issued. Check your email."
-msgstr "Se ha recibido una solicitud de restablecimiento de contraseña. Consulte su correo electrónico."
-
-#: ../../mod/lostpass.php:35 ../../mod/lostpass.php:103
-#, php-format
-msgid "Site Member (%s)"
-msgstr "Usuario del sitio (%s)"
-
-#: ../../mod/lostpass.php:40
-#, php-format
-msgid "Password reset requested at %s"
-msgstr "Se ha solicitado restablecer la contraseña en %s"
-
-#: ../../mod/lostpass.php:63
-msgid ""
-"Request could not be verified. (You may have previously submitted it.) "
-"Password reset failed."
-msgstr "La solicitud no ha podido ser verificada. (Puede que la haya enviado con anterioridad) El restablecimiento de la contraseña ha fallado."
-
-#: ../../mod/lostpass.php:87
-msgid "Your password has been reset as requested."
-msgstr "Su contraseña ha sido restablecida según lo solicitó."
-
-#: ../../mod/lostpass.php:88
-msgid "Your new password is"
-msgstr "Su nueva contraseña es"
-
-#: ../../mod/lostpass.php:89
-msgid "Save or copy your new password - and then"
-msgstr "Guarde o copie su nueva contraseña - y después"
-
-#: ../../mod/lostpass.php:90
-msgid "click here to login"
-msgstr "pulse aquí para conectarse"
-
-#: ../../mod/lostpass.php:91
-msgid ""
-"Your password may be changed from the <em>Settings</em> page after "
-"successful login."
-msgstr "Puede cambiar la contraseña en la página <em>Ajustes</em> una vez iniciada la sesión."
-
-#: ../../mod/lostpass.php:108
-#, php-format
-msgid "Your password has changed at %s"
-msgstr "Su contraseña en %s ha sido cambiada"
-
-#: ../../mod/lostpass.php:123
-msgid "Forgot your Password?"
-msgstr "¿Ha olvidado su contraseña?"
-
-#: ../../mod/lostpass.php:124
-msgid ""
-"Enter your email address and submit to have your password reset. Then check "
-"your email for further instructions."
-msgstr "Introduzca y envíe su dirección de correo electrónico para el restablecimiento de su contraseña. Luego revise su correo para obtener más instrucciones."
-
-#: ../../mod/lostpass.php:125
-msgid "Email Address"
-msgstr "Dirección de correo electrónico"
-
-#: ../../mod/lostpass.php:126
-msgid "Reset"
-msgstr "Reiniciar"
-
#: ../../mod/magic.php:69
msgid "Hub not found."
msgstr "Servidor no encontrado"
@@ -6876,10 +7014,6 @@ msgstr "Petición inválida del identificador."
msgid "Discard"
msgstr "Descartar"
-#: ../../mod/notifications.php:51 ../../mod/connedit.php:536
-msgid "Ignore"
-msgstr "Ignorar"
-
#: ../../mod/notifications.php:94 ../../mod/notify.php:53
msgid "No more system notifications."
msgstr "No hay más notificaciones del sistema"
@@ -6925,23 +7059,23 @@ msgid ""
" to correctly use this feature."
msgstr "Atención: El cambio de algunos ajustes puede volver inutilizable su canal. Por favor, abandone la página excepto que esté seguro y sepa cómo usar correctamente esta característica."
-#: ../../mod/pdledit.php:13
+#: ../../mod/pdledit.php:14
msgid "Layout updated."
msgstr "Formato actualizado"
-#: ../../mod/pdledit.php:28 ../../mod/pdledit.php:53
+#: ../../mod/pdledit.php:29 ../../mod/pdledit.php:54
msgid "Edit System Page Description"
msgstr "Editor del Sistema de Descripción de Páginas"
-#: ../../mod/pdledit.php:48
+#: ../../mod/pdledit.php:49
msgid "Layout not found."
msgstr "Formato no encontrado"
-#: ../../mod/pdledit.php:54
+#: ../../mod/pdledit.php:55
msgid "Module Name:"
msgstr "Nombre del módulo:"
-#: ../../mod/pdledit.php:55
+#: ../../mod/pdledit.php:56
msgid "Layout Help"
msgstr "Ayuda para el diseño de la página"
@@ -7556,10 +7690,6 @@ msgstr "Opcionalmente puede explicar su valoración (esta información es públi
msgid "No ratings"
msgstr "Ninguna valoración"
-#: ../../mod/ratings.php:99
-msgid "Ratings"
-msgstr "Valoraciones"
-
#: ../../mod/ratings.php:100
msgid "Rating: "
msgstr "Valoración:"
@@ -8000,8 +8130,8 @@ msgid "(comments displayed separately)"
msgstr "(comentarios mostrados de forma separada)"
#: ../../mod/settings.php:849
-msgid "Use blog/list mode on matrix page"
-msgstr "Mostrar la red en modo blog/lista"
+msgid "Use blog/list mode on grid page"
+msgstr "Mostrar mi red en modo blog"
#: ../../mod/settings.php:850
msgid "Channel page max height of content (in pixels)"
@@ -8012,8 +8142,8 @@ msgid "click to expand content exceeding this height"
msgstr "Pulsar para expandir el contenido que exceda de esta altura"
#: ../../mod/settings.php:851
-msgid "Matrix page max height of content (in pixels)"
-msgstr "Altura máxima del contenido de la página de su red (en píxeles)"
+msgid "Grid page max height of content (in pixels)"
+msgstr "Altura máxima del contenido de mi red (en píxeles)"
#: ../../mod/settings.php:885
msgid "Nobody except yourself"
@@ -8238,8 +8368,8 @@ msgid "Show visual notifications including:"
msgstr "Mostrar notificaciones visuales que incluyan:"
#: ../../mod/settings.php:1087
-msgid "Unseen matrix activity"
-msgstr "Actividad no vista en la red"
+msgid "Unseen grid activity"
+msgstr "Nueva actividad en la red"
#: ../../mod/settings.php:1088
msgid "Unseen channel activity"
@@ -8757,259 +8887,78 @@ msgid ""
"poller."
msgstr "IMPORTANTE: Debe crear [manualmente] una tarea programada para el \"poller\"."
-#: ../../mod/connedit.php:75
-msgid "Could not access contact record."
-msgstr "No se ha podido acceder al registro de contacto."
-
-#: ../../mod/connedit.php:99
-msgid "Could not locate selected profile."
-msgstr "No se ha podido localizar el perfil seleccionado."
-
-#: ../../mod/connedit.php:223
-msgid "Connection updated."
-msgstr "Conexión actualizada."
-
-#: ../../mod/connedit.php:225
-msgid "Failed to update connection record."
-msgstr "Error al actualizar el registro de la conexión."
-
-#: ../../mod/connedit.php:272
-msgid "is now connected to"
-msgstr "ahora está conectado/a"
-
-#: ../../mod/connedit.php:398
-msgid "Could not access address book record."
-msgstr "No se pudo acceder al registro en su libreta de direcciones."
-
-#: ../../mod/connedit.php:412
-msgid "Refresh failed - channel is currently unavailable."
-msgstr "Recarga fallida - no se puede encontrar el canal en este momento."
-
-#: ../../mod/connedit.php:427 ../../mod/connedit.php:436
-#: ../../mod/connedit.php:445 ../../mod/connedit.php:454
-#: ../../mod/connedit.php:467
-msgid "Unable to set address book parameters."
-msgstr "No ha sido posible establecer los parámetros de la libreta de direcciones."
+#: ../../mod/lostpass.php:15
+msgid "No valid account found."
+msgstr "No se ha encontrado una cuenta válida."
-#: ../../mod/connedit.php:491
-msgid "Connection has been removed."
-msgstr "La conexión ha sido eliminada."
+#: ../../mod/lostpass.php:29
+msgid "Password reset request issued. Check your email."
+msgstr "Se ha recibido una solicitud de restablecimiento de contraseña. Consulte su correo electrónico."
-#: ../../mod/connedit.php:510
+#: ../../mod/lostpass.php:35 ../../mod/lostpass.php:103
#, php-format
-msgid "View %s's profile"
-msgstr "Ver el perfil de %s"
-
-#: ../../mod/connedit.php:514
-msgid "Refresh Permissions"
-msgstr "Recargar los permisos"
-
-#: ../../mod/connedit.php:517
-msgid "Fetch updated permissions"
-msgstr "Obtener los permisos actualizados"
-
-#: ../../mod/connedit.php:521
-msgid "Recent Activity"
-msgstr "Actividad reciente"
-
-#: ../../mod/connedit.php:524
-msgid "View recent posts and comments"
-msgstr "Ver publicaciones y comentarios recientes"
-
-#: ../../mod/connedit.php:531
-msgid "Block (or Unblock) all communications with this connection"
-msgstr "Bloquear (o desbloquear) todas las comunicaciones con esta conexión"
-
-#: ../../mod/connedit.php:532
-msgid "This connection is blocked!"
-msgstr "¡Esta conexión está bloqueada!"
-
-#: ../../mod/connedit.php:536
-msgid "Unignore"
-msgstr "Dejar de ignorar"
-
-#: ../../mod/connedit.php:539
-msgid "Ignore (or Unignore) all inbound communications from this connection"
-msgstr "Ignorar (o dejar de ignorar) todas las comunicaciones entrantes de esta conexión"
-
-#: ../../mod/connedit.php:540
-msgid "This connection is ignored!"
-msgstr "¡Esta conexión es ignorada!"
-
-#: ../../mod/connedit.php:544
-msgid "Unarchive"
-msgstr "Desarchivar"
-
-#: ../../mod/connedit.php:544
-msgid "Archive"
-msgstr "Archivar"
-
-#: ../../mod/connedit.php:547
-msgid ""
-"Archive (or Unarchive) this connection - mark channel dead but keep content"
-msgstr "Archiva (o desarchiva) esta conexión - marca el canal como muerto aunque mantiene sus contenidos"
-
-#: ../../mod/connedit.php:548
-msgid "This connection is archived!"
-msgstr "¡Esta conexión esta archivada!"
-
-#: ../../mod/connedit.php:552
-msgid "Unhide"
-msgstr "Mostrar"
-
-#: ../../mod/connedit.php:552
-msgid "Hide"
-msgstr "Ocultar"
-
-#: ../../mod/connedit.php:555
-msgid "Hide or Unhide this connection from your other connections"
-msgstr "Ocultar o mostrar esta conexión a sus otras conexiones"
-
-#: ../../mod/connedit.php:556
-msgid "This connection is hidden!"
-msgstr "¡Esta conexión está oculta!"
-
-#: ../../mod/connedit.php:563
-msgid "Delete this connection"
-msgstr "Eliminar esta conexión"
-
-#: ../../mod/connedit.php:644
-msgid "Approve this connection"
-msgstr "Aprobar esta conexión"
-
-#: ../../mod/connedit.php:644
-msgid "Accept connection to allow communication"
-msgstr "Aceptar la conexión para permitir la comunicación"
-
-#: ../../mod/connedit.php:649
-msgid "Set Affinity"
-msgstr "Ajustar la afinidad"
-
-#: ../../mod/connedit.php:652
-msgid "Set Profile"
-msgstr "Ajustar el perfil"
-
-#: ../../mod/connedit.php:655
-msgid "Set Affinity & Profile"
-msgstr "Ajustar la afinidad y el perfil"
-
-#: ../../mod/connedit.php:688
-msgid "none"
-msgstr "-"
-
-#: ../../mod/connedit.php:693
-msgid "Apply these permissions automatically"
-msgstr "Aplicar estos permisos automaticamente"
-
-#: ../../mod/connedit.php:695
-msgid "This connection's primary address is"
-msgstr "La dirección primaria de esta conexión es"
+msgid "Site Member (%s)"
+msgstr "Usuario del sitio (%s)"
-#: ../../mod/connedit.php:696
-msgid "Available locations:"
-msgstr "Ubicaciones disponibles:"
+#: ../../mod/lostpass.php:40
+#, php-format
+msgid "Password reset requested at %s"
+msgstr "Se ha solicitado restablecer la contraseña en %s"
-#: ../../mod/connedit.php:700
+#: ../../mod/lostpass.php:63
msgid ""
-"The permissions indicated on this page will be applied to all new "
-"connections."
-msgstr "Los permisos indicados en esta página serán aplicados en todas las nuevas conexiones."
-
-#: ../../mod/connedit.php:702
-msgid "Slide to adjust your degree of friendship"
-msgstr "Deslizar para ajustar el grado de amistad"
-
-#: ../../mod/connedit.php:704
-msgid "Slide to adjust your rating"
-msgstr "Deslizar para ajustar su valoración"
-
-#: ../../mod/connedit.php:705 ../../mod/connedit.php:710
-msgid "Optionally explain your rating"
-msgstr "Opcionalmente, puede explicar su valoración"
-
-#: ../../mod/connedit.php:707
-msgid "Custom Filter"
-msgstr "Filtro personalizado"
-
-#: ../../mod/connedit.php:708
-msgid "Only import posts with this text"
-msgstr "Importar solo entradas que contengan este texto"
+"Request could not be verified. (You may have previously submitted it.) "
+"Password reset failed."
+msgstr "La solicitud no ha podido ser verificada. (Puede que la haya enviado con anterioridad) El restablecimiento de la contraseña ha fallado."
-#: ../../mod/connedit.php:708 ../../mod/connedit.php:709
-msgid ""
-"words one per line or #tags or /patterns/ or lang=xx, leave blank to import "
-"all posts"
-msgstr "Una sola opción por línea: palabras, #etiquetas, /patrones/ o lang=xx. Dejar en blanco para importarlo todo"
+#: ../../mod/lostpass.php:86 ../../boot.php:1516
+msgid "Password Reset"
+msgstr "Restablecer la contraseña"
-#: ../../mod/connedit.php:709
-msgid "Do not import posts with this text"
-msgstr "No importar entradas que contengan este texto"
+#: ../../mod/lostpass.php:87
+msgid "Your password has been reset as requested."
+msgstr "Su contraseña ha sido restablecida según lo solicitó."
-#: ../../mod/connedit.php:711
-msgid "This information is public!"
-msgstr "¡Esta información es pública!"
+#: ../../mod/lostpass.php:88
+msgid "Your new password is"
+msgstr "Su nueva contraseña es"
-#: ../../mod/connedit.php:716
-msgid "Connection Pending Approval"
-msgstr "Conexión pendiente de aprobación"
+#: ../../mod/lostpass.php:89
+msgid "Save or copy your new password - and then"
+msgstr "Guarde o copie su nueva contraseña - y después"
-#: ../../mod/connedit.php:717
-msgid "Connection Request"
-msgstr "Solicitud de conexión"
+#: ../../mod/lostpass.php:90
+msgid "click here to login"
+msgstr "pulse aquí para conectarse"
-#: ../../mod/connedit.php:718
-#, php-format
+#: ../../mod/lostpass.php:91
msgid ""
-"(%s) would like to connect with you. Please approve this connection to allow"
-" communication."
-msgstr "(%s) desearía conectar con usted. por favor, apruebe esta conexión para permitir la comunicación."
-
-#: ../../mod/connedit.php:720
-msgid "Approve Later"
-msgstr "Aprobar más tarde"
-
-#: ../../mod/connedit.php:723
-msgid "inherited"
-msgstr "heredado"
+"Your password may be changed from the <em>Settings</em> page after "
+"successful login."
+msgstr "Puede cambiar la contraseña en la página <em>Ajustes</em> una vez iniciada la sesión."
-#: ../../mod/connedit.php:725
+#: ../../mod/lostpass.php:108
#, php-format
-msgid ""
-"Please choose the profile you would like to display to %s when viewing your "
-"profile securely."
-msgstr "Por favor, escoja el perfil que quiere mostrar a %s cuando esté viendo su perfil de forma segura."
-
-#: ../../mod/connedit.php:727
-msgid "Their Settings"
-msgstr "Sus ajustes"
-
-#: ../../mod/connedit.php:728
-msgid "My Settings"
-msgstr "Mis ajustes"
+msgid "Your password has changed at %s"
+msgstr "Su contraseña en %s ha sido cambiada"
-#: ../../mod/connedit.php:730
-msgid "Individual Permissions"
-msgstr "Permisos individuales"
+#: ../../mod/lostpass.php:123
+msgid "Forgot your Password?"
+msgstr "¿Ha olvidado su contraseña?"
-#: ../../mod/connedit.php:731
+#: ../../mod/lostpass.php:124
msgid ""
-"Some permissions may be inherited from your channel's <a "
-"href=\"settings\"><strong>privacy settings</strong></a>, which have higher "
-"priority than individual settings. You can <strong>not</strong> change those"
-" settings here."
-msgstr "Algunos permisos pueden ser heredados de los <a href=\"settings\"><strong>ajustes de privacidad</strong></a> de sus canales, los cuales tienen una prioridad más alta que los ajustes individuales. <strong>No</strong> puede cambiar estos ajustes aquí."
+"Enter your email address and submit to have your password reset. Then check "
+"your email for further instructions."
+msgstr "Introduzca y envíe su dirección de correo electrónico para el restablecimiento de su contraseña. Luego revise su correo para obtener más instrucciones."
-#: ../../mod/connedit.php:732
-msgid ""
-"Some permissions may be inherited from your channel's <a "
-"href=\"settings\"><strong>privacy settings</strong></a>, which have higher "
-"priority than individual settings. You can change those settings here but "
-"they wont have any impact unless the inherited setting changes."
-msgstr "Algunos permisos pueden ser heredados de los <a href=\"settings\"><strong>ajustes de privacidad</strong></a> de sus canales, los cuales tienen una prioridad más alta que los ajustes individuales. Puede cambiar estos ajustes aquí, pero no tendrán ningún consecuencia hasta que cambie los ajustes heredados."
+#: ../../mod/lostpass.php:125
+msgid "Email Address"
+msgstr "Dirección de correo electrónico"
-#: ../../mod/connedit.php:733
-msgid "Last update:"
-msgstr "Última actualización:"
+#: ../../mod/lostpass.php:126
+msgid "Reset"
+msgstr "Reiniciar"
#: ../../mod/sharedwithme.php:94
msgid "Files: shared with me"
@@ -9301,6 +9250,10 @@ msgstr "Sin conexiones."
msgid "Visit %s's profile [%s]"
msgstr "Visitar el perfil de %s [%s]"
+#: ../../mod/viewconnections.php:101
+msgid "View Connections"
+msgstr "Ver conexiones"
+
#: ../../mod/viewsrc.php:40
msgid "Source of Item"
msgstr "Origen del elemento"
@@ -9460,3 +9413,52 @@ msgstr "Ajustar el tamaño de la foto del autor de la conversación"
#: ../../view/theme/redbasic/php/config.php:132
msgid "Set size of followup author photos"
msgstr "Ajustar el tamaño de foto de los seguidores del autor"
+
+#: ../../boot.php:1319
+#, php-format
+msgid "Update %s failed. See error logs."
+msgstr "La actualización %s ha fallado. Mire el informe de errores."
+
+#: ../../boot.php:1322
+#, php-format
+msgid "Update Error at %s"
+msgstr "Error de actualización en %s"
+
+#: ../../boot.php:1489
+msgid ""
+"Create an account to access services and applications within the Hubzilla"
+msgstr "Crear una cuenta para acceder a los servicios y aplicaciones dentro de Hubzilla"
+
+#: ../../boot.php:1511
+msgid "Password"
+msgstr "Contraseña"
+
+#: ../../boot.php:1512
+msgid "Remember me"
+msgstr "Recordarme"
+
+#: ../../boot.php:1515
+msgid "Forgot your password?"
+msgstr "¿Olvidó su contraseña?"
+
+#: ../../boot.php:2137
+msgid "toggle mobile"
+msgstr "cambiar a modo móvil"
+
+#: ../../boot.php:2289
+msgid "Website SSL certificate is not valid. Please correct."
+msgstr "El certificado SSL del sitio web no es válido. Por favor, solucione el problema."
+
+#: ../../boot.php:2292
+#, php-format
+msgid "[hubzilla] Website SSL error for %s"
+msgstr "[hubzilla] Error SSL del sitio web en %s"
+
+#: ../../boot.php:2329
+msgid "Cron/Scheduled tasks not running."
+msgstr "Las tareas del Planificador/Cron no están funcionando."
+
+#: ../../boot.php:2333
+#, php-format
+msgid "[hubzilla] Cron tasks not running on %s"
+msgstr "[hubzilla] Las tareas de Cron no están funcionando en %s"
diff --git a/view/es-es/hstrings.php b/view/es-es/hstrings.php
index 313683578..397d52f6a 100644
--- a/view/es-es/hstrings.php
+++ b/view/es-es/hstrings.php
@@ -7,25 +7,6 @@ function string_plural_select_es_es($n){
;
$a->strings["Remote authentication blocked. You are logged into this site locally. Please logout and retry."] = "La autenticación desde su servidor está bloqueada. Ha iniciado sesión localmente. Por favor, salga de la sesión y vuelva a intentarlo.";
$a->strings["Welcome %s. Remote authentication successful."] = "Bienvenido %s. La identificación desde su servidor se ha llevado a cabo correctamente.";
-$a->strings["Update %s failed. See error logs."] = "La actualización %s ha fallado. Mire el informe de errores.";
-$a->strings["Update Error at %s"] = "Error de actualización en %s";
-$a->strings["Create an account to access services and applications within the Hubzilla"] = "Crear una cuenta para acceder a los servicios y aplicaciones dentro de Hubzilla";
-$a->strings["Register"] = "Registrarse";
-$a->strings["Logout"] = "Finalizar sesión";
-$a->strings["Login"] = "Iniciar sesión";
-$a->strings["Email"] = "Correo electrónico";
-$a->strings["Password"] = "Contraseña";
-$a->strings["Remember me"] = "Recordarme";
-$a->strings["No"] = "No";
-$a->strings["Yes"] = "Sí";
-$a->strings["Forgot your password?"] = "¿Olvidó su contraseña?";
-$a->strings["Password Reset"] = "Restablecer la contraseña";
-$a->strings["toggle mobile"] = "cambiar a modo móvil";
-$a->strings["Website SSL certificate is not valid. Please correct."] = "El certificado SSL del sitio web no es válido. Por favor, solucione el problema.";
-$a->strings["[hubzilla] Website SSL error for %s"] = "[hubzilla] Error SSL del sitio web en %s";
-$a->strings["Cron/Scheduled tasks not running."] = "Las tareas del Planificador/Cron no están funcionando.";
-$a->strings["never"] = "nunca";
-$a->strings["[hubzilla] Cron tasks not running on %s"] = "[hubzilla] Las tareas de Cron no están funcionando en %s";
$a->strings["Connect"] = "Conectar";
$a->strings["New window"] = "Nueva ventana";
$a->strings["Open the selected location in a different window or browser tab"] = "Abrir la dirección seleccionada en una ventana o pestaña aparte";
@@ -154,6 +135,7 @@ $a->strings["Public Timeline"] = "Cronología pública";
$a->strings["Site Admin"] = "Adminstrador del sitio";
$a->strings["Bookmarks"] = "Marcadores";
$a->strings["Address Book"] = "Libreta de direcciones";
+$a->strings["Login"] = "Iniciar sesión";
$a->strings["Channel Manager"] = "Administración de canales";
$a->strings["Grid"] = "Red";
$a->strings["Settings"] = "Ajustes";
@@ -225,21 +207,6 @@ $a->strings["Invalid room specifier."] = "Especificador de sala no válido.";
$a->strings["Room not found."] = "Sala no encontrada.";
$a->strings["Room is full"] = "La sala está llena.";
$a->strings["Default"] = "Predeterminado";
-$a->strings["Frequently"] = "Frecuentemente";
-$a->strings["Hourly"] = "Cada hora";
-$a->strings["Twice daily"] = "Dos veces al día";
-$a->strings["Daily"] = "Diariamente";
-$a->strings["Weekly"] = "Semanalmente";
-$a->strings["Monthly"] = "Mensualmente";
-$a->strings["Friendica"] = "Friendica";
-$a->strings["OStatus"] = "OStatus";
-$a->strings["RSS/Atom"] = "RSS/Atom";
-$a->strings["Diaspora"] = "Diaspora";
-$a->strings["Facebook"] = "Facebook";
-$a->strings["Zot!"] = "Zot!";
-$a->strings["LinkedIn"] = "LinkedIn";
-$a->strings["XMPP/IM"] = "XMPP/IM";
-$a->strings["MySpace"] = "MySpace";
$a->strings["%d invitation available"] = array(
0 => "%d invitación pendiente",
1 => "%d invitaciones disponibles",
@@ -291,12 +258,11 @@ $a->strings["Delete Selected Items"] = "Eliminar elementos seleccionados";
$a->strings["View Source"] = "Ver la fuente original de la publicación";
$a->strings["Follow Thread"] = "Seguir este hilo";
$a->strings["Unfollow Thread"] = "Dejar de seguir este hilo";
-$a->strings["View Status"] = "Ver mi estado actual";
$a->strings["View Profile"] = "Ver el perfil";
-$a->strings["View Photos"] = "Ver fotos";
$a->strings["Activity/Posts"] = "Actividad y publicaciones";
$a->strings["Edit Connection"] = "Editar conexión";
-$a->strings["Send PM"] = "Enviar un mensaje privado";
+$a->strings["Message"] = "Mensaje";
+$a->strings["Ratings"] = "Valoraciones";
$a->strings["%s likes this."] = "A %s le gusta esto.";
$a->strings["%s doesn't like this."] = "A %s no le gusta esto.";
$a->strings["<span %1\$s>%2\$d people</span> like this."] = array(
@@ -400,6 +366,7 @@ $a->strings["__ctx:noun__ Abstain"] = array(
$a->strings["Miscellaneous"] = "Varios";
$a->strings["YYYY-MM-DD or MM-DD"] = "AAAA-MM-DD o MM-DD";
$a->strings["Required"] = "Obligatorio";
+$a->strings["never"] = "nunca";
$a->strings["less than a second ago"] = "hace un instante";
$a->strings["year"] = "año";
$a->strings["years"] = "años";
@@ -421,6 +388,8 @@ $a->strings["Happy Birthday %1\$s"] = "Feliz cumpleaños %1\$s";
$a->strings["Cannot locate DNS info for database server '%s'"] = "No se ha podido localizar información de DNS para el servidor de base de datos “%s”";
$a->strings["Directory Options"] = "Opciones del directorio";
$a->strings["Safe Mode"] = "Modo seguro";
+$a->strings["No"] = "No";
+$a->strings["Yes"] = "Sí";
$a->strings["Public Forums Only"] = "Solo foros públicos";
$a->strings["This Website Only"] = "Solo este sitio web";
$a->strings["\$Projectname Notification"] = "Notificación de \$Projectname";
@@ -469,71 +438,6 @@ $a->strings["Needs Action"] = "Necesita de una intervención";
$a->strings["Completed"] = "Completado/a";
$a->strings["In Process"] = "En proceso";
$a->strings["Cancelled"] = "Cancelado/a";
-$a->strings["General Features"] = "Funcionalidades básicas";
-$a->strings["Content Expiration"] = "Caducidad del contenido";
-$a->strings["Remove posts/comments and/or private messages at a future time"] = "Eliminar publicaciones/comentarios y/o mensajes privados más adelante";
-$a->strings["Multiple Profiles"] = "Múltiples perfiles";
-$a->strings["Ability to create multiple profiles"] = "Capacidad de crear múltiples perfiles";
-$a->strings["Advanced Profiles"] = "Perfiles avanzados";
-$a->strings["Additional profile sections and selections"] = "Secciones y selecciones de perfil adicionales";
-$a->strings["Profile Import/Export"] = "Importar/Exportar perfil";
-$a->strings["Save and load profile details across sites/channels"] = "Guardar y cargar detalles del perfil a través de sitios/canales";
-$a->strings["Web Pages"] = "Páginas web";
-$a->strings["Provide managed web pages on your channel"] = "Proveer páginas web gestionadas en su canal";
-$a->strings["Private Notes"] = "Notas privadas";
-$a->strings["Enables a tool to store notes and reminders"] = "Activar una herramienta para almacenar notas y recordatorios";
-$a->strings["Navigation Channel Select"] = "Navegación por el selector de canales";
-$a->strings["Change channels directly from within the navigation dropdown menu"] = "Cambiar de canales directamente desde el menú de navegación desplegable";
-$a->strings["Photo Location"] = "Ubicación de las fotos";
-$a->strings["If location data is available on uploaded photos, link this to a map."] = "Si los datos de ubicación están disponibles en las fotos subidas, enlazar estas a un mapa.";
-$a->strings["Expert Mode"] = "Modo de experto";
-$a->strings["Enable Expert Mode to provide advanced configuration options"] = "Habilitar el modo de experto para acceder a opciones avanzadas de configuración";
-$a->strings["Premium Channel"] = "Canal premium";
-$a->strings["Allows you to set restrictions and terms on those that connect with your channel"] = "Les permite configurar restricciones y normas de uso a aquellos que conectan con su canal";
-$a->strings["Post Composition Features"] = "Opciones para la redacción de entradas";
-$a->strings["Use Markdown"] = "Usar Markdown";
-$a->strings["Allow use of \"Markdown\" to format posts"] = "Permitir el uso de \"Markdown\" para formatear publicaciones";
-$a->strings["Large Photos"] = "Fotos de gran tamaño";
-$a->strings["Include large (1024px) photo thumbnails in posts. If not enabled, use small (640px) photo thumbnails"] = "Incluir miniaturas de fotos grandes (1024px) en publicaciones. Si no está habilitado, usar miniaturas pequeñas (640px)";
-$a->strings["Channel Sources"] = "Orígenes de los contenidos del canal";
-$a->strings["Automatically import channel content from other channels or feeds"] = "Importar automáticamente contenido de otros canales o \"feeds\"";
-$a->strings["Even More Encryption"] = "Más cifrado todavía";
-$a->strings["Allow optional encryption of content end-to-end with a shared secret key"] = "Permitir cifrado adicional de contenido \"punto-a-punto\" con una clave secreta compartida.";
-$a->strings["Enable Voting Tools"] = "Permitir entradas con votación";
-$a->strings["Provide a class of post which others can vote on"] = "Proveer una clase de publicación en la que otros puedan votar";
-$a->strings["Delayed Posting"] = "Publicación aplazada";
-$a->strings["Allow posts to be published at a later date"] = "Permitir mensajes que se publicarán en una fecha posterior";
-$a->strings["Suppress Duplicate Posts/Comments"] = "Prevenir entradas o comentarios duplicados";
-$a->strings["Prevent posts with identical content to be published with less than two minutes in between submissions."] = "Prevenir que entradas con contenido idéntico se publiquen con menos de dos minutos de intervalo.";
-$a->strings["Network and Stream Filtering"] = "Filtrado del contenido";
-$a->strings["Search by Date"] = "Buscar por fecha";
-$a->strings["Ability to select posts by date ranges"] = "Capacidad de seleccionar entradas por rango de fechas";
-$a->strings["Collections Filter"] = "Filtrado de colecciones";
-$a->strings["Enable widget to display Network posts only from selected collections"] = "Habilitar la muestra de entradas eligiendo colecciones";
-$a->strings["Saved Searches"] = "Búsquedas guardadas";
-$a->strings["Save search terms for re-use"] = "Guardar términos de búsqueda para su reutilización";
-$a->strings["Network Personal Tab"] = "Actividad personal";
-$a->strings["Enable tab to display only Network posts that you've interacted on"] = "Habilitar una pestaña en la cual se muestren solo las entradas en las que ha participado.";
-$a->strings["Network New Tab"] = "Contenido nuevo";
-$a->strings["Enable tab to display all new Network activity"] = "Habilitar una pestaña en la que se muestre solo el contenido nuevo";
-$a->strings["Affinity Tool"] = "Herramienta de afinidad";
-$a->strings["Filter stream activity by depth of relationships"] = "Filtrar el contenido según la profundidad de las relaciones";
-$a->strings["Connection Filtering"] = "Filtrado de conexiones";
-$a->strings["Filter incoming posts from connections based on keywords/content"] = "Filtrar publicaciones entrantes de conexiones por palabras clave o contenido";
-$a->strings["Suggest Channels"] = "Sugerir canales";
-$a->strings["Show channel suggestions"] = "Mostrar sugerencias de canales";
-$a->strings["Post/Comment Tools"] = "Gestión de entradas y comentarios";
-$a->strings["Community Tagging"] = "Etiquetas de la comunidad";
-$a->strings["Ability to tag existing posts"] = "Capacidad de etiquetar entradas existentes";
-$a->strings["Post Categories"] = "Categorías de entradas";
-$a->strings["Add categories to your posts"] = "Añadir categorías a sus publicaciones";
-$a->strings["Ability to file posts under folders"] = "Capacidad de archivar entradas en carpetas";
-$a->strings["Dislike Posts"] = "Desagrado de publicaciones";
-$a->strings["Ability to dislike posts/comments"] = "Capacidad de mostrar desacuerdo con el contenido de entradas y comentarios";
-$a->strings["Star Posts"] = "Entradas destacadas";
-$a->strings["Ability to mark special posts with a star indicator"] = "Capacidad de marcar entradas destacadas con un indicador de estrella";
-$a->strings["Tag Cloud"] = "Nube de etiquetas";
-$a->strings["Provide a personal tag cloud on your channel page"] = "Proveer nube de etiquetas personal en su página de canal";
$a->strings["Channel is blocked on this site."] = "El canal está bloqueado en este sitio.";
$a->strings["Channel location missing."] = "Falta la dirección del canal.";
$a->strings["Response from remote channel was incomplete."] = "Respuesta incompleta del canal.";
@@ -551,84 +455,9 @@ $a->strings["Edit collection"] = "Editar colección";
$a->strings["Add new collection"] = "Añadir nueva colección";
$a->strings["Channels not in any collection"] = "El canal no se encuentra en ninguna colección";
$a->strings["add"] = "añadir";
-$a->strings["Unable to obtain identity information from database"] = "No ha sido posible obtener información sobre la identidad desde la base de datos";
-$a->strings["Empty name"] = "Nombre vacío";
-$a->strings["Name too long"] = "Nombre demasiado largo";
-$a->strings["No account identifier"] = "Ningún identificador de la cuenta";
-$a->strings["Nickname is required."] = "Se requiere un sobrenombre (alias).";
-$a->strings["Reserved nickname. Please choose another."] = "Sobrenombre en uso. Por favor, elija otro.";
-$a->strings["Nickname has unsupported characters or is already being used on this site."] = "El alias contiene caracteres no admitidos o está ya en uso por otros usuarios de este sitio.";
-$a->strings["Unable to retrieve created identity"] = "No ha sido posible recuperar la identidad creada";
-$a->strings["Default Profile"] = "Perfil principal";
-$a->strings["Friends"] = "Amigos/as";
-$a->strings["Requested channel is not available."] = "El canal solicitado no está disponible.";
-$a->strings["Requested profile is not available."] = "El perfil solicitado no está disponible.";
-$a->strings["Change profile photo"] = "Cambiar la foto del perfil";
-$a->strings["Profiles"] = "Perfiles";
-$a->strings["Manage/edit profiles"] = "Administrar/editar perfiles";
-$a->strings["Create New Profile"] = "Crear un nuevo perfil";
-$a->strings["Edit Profile"] = "Editar el perfil";
-$a->strings["Profile Image"] = "Imagen del perfil";
-$a->strings["visible to everybody"] = "visible para cualquiera";
-$a->strings["Edit visibility"] = "Editar visibilidad";
-$a->strings["Gender:"] = "Género:";
-$a->strings["Status:"] = "Estado:";
-$a->strings["Homepage:"] = "Página personal:";
-$a->strings["Online Now"] = "Ahora en línea";
-$a->strings["g A l F d"] = "g A l d F";
-$a->strings["F d"] = "d F";
-$a->strings["[today]"] = "[hoy]";
-$a->strings["Birthday Reminders"] = "Recordatorios de cumpleaños";
-$a->strings["Birthdays this week:"] = "Cumpleaños de esta semana:";
-$a->strings["[No description]"] = "[Sin descripción]";
-$a->strings["Event Reminders"] = "Recordatorios de eventos";
-$a->strings["Events this week:"] = "Eventos de esta semana:";
-$a->strings["Full Name:"] = "Nombre completo:";
-$a->strings["Like this channel"] = "Me gusta este canal";
-$a->strings["j F, Y"] = "j F Y";
-$a->strings["j F"] = "j F";
-$a->strings["Birthday:"] = "Cumpleaños:";
-$a->strings["Age:"] = "Edad:";
-$a->strings["for %1\$d %2\$s"] = "por %1\$d %2\$s";
-$a->strings["Sexual Preference:"] = "Orientación sexual:";
-$a->strings["Hometown:"] = "Ciudad de origen:";
-$a->strings["Tags:"] = "Etiquetas:";
-$a->strings["Political Views:"] = "Posición política:";
-$a->strings["Religion:"] = "Religión:";
-$a->strings["About:"] = "Sobre mí:";
-$a->strings["Hobbies/Interests:"] = "Aficciones/Intereses:";
-$a->strings["Likes:"] = "Me gusta:";
-$a->strings["Dislikes:"] = "No me gusta:";
-$a->strings["Contact information and Social Networks:"] = "Información de contacto y redes sociales:";
-$a->strings["My other channels:"] = "Mis otros canales:";
-$a->strings["Musical interests:"] = "Intereses musicales:";
-$a->strings["Books, literature:"] = "Libros, literatura:";
-$a->strings["Television:"] = "Televisión:";
-$a->strings["Film/dance/culture/entertainment:"] = "Cine/danza/cultura/entretenimiento:";
-$a->strings["Love/Romance:"] = "Vida sentimental/amorosa:";
-$a->strings["Work/employment:"] = "Trabajo:";
-$a->strings["School/education:"] = "Estudios:";
-$a->strings["Like this thing"] = "Me gusta esto";
-$a->strings["cover photo"] = "Imagen de portada del perfil";
$a->strings["Cannot create a duplicate channel identifier on this system. Import failed."] = "No se ha podido crear un canal con un identificador que ya existe en este sistema. La importación ha fallado.";
$a->strings["Channel clone failed. Import failed."] = "La clonación del canal no ha salido bien. La importación ha fallado.";
$a->strings["Cloned channel not found. Import failed."] = "No se ha podido importar el canal porque el canal clonado no se ha encontrado.";
-$a->strings["Permission denied"] = "Permiso denegado";
-$a->strings["(Unknown)"] = "(Desconocido)";
-$a->strings["Visible to anybody on the internet."] = "Visible para cualquiera en internet.";
-$a->strings["Visible to you only."] = "Visible sólo para usted.";
-$a->strings["Visible to anybody in this network."] = "Visible para cualquiera en esta red.";
-$a->strings["Visible to anybody authenticated."] = "Visible para cualquiera que haya sido autenticado.";
-$a->strings["Visible to anybody on %s."] = "Visible para cualquiera en %s.";
-$a->strings["Visible to all connections."] = "Visible para todas las conexiones.";
-$a->strings["Visible to approved connections."] = "Visible para las conexiones permitidas.";
-$a->strings["Visible to specific connections."] = "Visible para conexiones específicas.";
-$a->strings["Item not found."] = "Elemento no encontrado.";
-$a->strings["Collection not found."] = "Colección no encontrada.";
-$a->strings["Collection is empty."] = "La colección está vacía.";
-$a->strings["Collection: %s"] = "Colección: %s";
-$a->strings["Connection: %s"] = "Conexión: %s";
-$a->strings["Connection not found."] = "Conexión no encontrada";
$a->strings["Delete this item?"] = "¿Borrar este elemento?";
$a->strings["[-] show less"] = "[-] mostrar menos";
$a->strings["[+] expand"] = "[+] expandir";
@@ -711,12 +540,14 @@ $a->strings["No recipient provided."] = "No se ha especificado ningún destinata
$a->strings["[no subject]"] = "[sin asunto]";
$a->strings["Unable to determine sender."] = "No ha sido posible determinar el remitente. ";
$a->strings["Stored post could not be verified."] = "No se han podido verificar las publicaciones guardadas.";
+$a->strings["Logout"] = "Finalizar sesión";
$a->strings["End this session"] = "Finalizar esta sesión";
$a->strings["Home"] = "Inicio";
$a->strings["Your posts and conversations"] = "Sus publicaciones y conversaciones";
$a->strings["Your profile page"] = "Su página del perfil";
$a->strings["Edit Profiles"] = "Editar perfiles";
$a->strings["Manage/Edit profiles"] = "Administrar/editar perfiles";
+$a->strings["Edit Profile"] = "Editar el perfil";
$a->strings["Edit your profile"] = "Editar su perfil";
$a->strings["Your photos"] = "Sus fotos";
$a->strings["Your files"] = "Sus ficheros";
@@ -728,6 +559,7 @@ $a->strings["%s - click to logout"] = "%s - pulsar para finalizar sesión";
$a->strings["Remote authentication"] = "Acceder desde su servidor";
$a->strings["Click to authenticate to your home hub"] = "Pulsar para identificarse en su servidor de inicio";
$a->strings["Home Page"] = "Página de inicio";
+$a->strings["Register"] = "Registrarse";
$a->strings["Create an account"] = "Crear una cuenta";
$a->strings["Help and documentation"] = "Ayuda y documentación";
$a->strings["Apps"] = "Aplicaciones";
@@ -845,6 +677,7 @@ $a->strings["Infatuated"] = "Apasionado/a";
$a->strings["Dating"] = "Saliendo con alguien";
$a->strings["Unfaithful"] = "Infiel";
$a->strings["Sex Addict"] = "Con adicción al sexo";
+$a->strings["Friends"] = "Amigos/as";
$a->strings["Friends/Benefits"] = "Amigos con algo extra";
$a->strings["Casual"] = "Casual";
$a->strings["Engaged"] = "Prometido/a";
@@ -875,6 +708,150 @@ $a->strings["want"] = "quiero";
$a->strings["wants"] = "quiere";
$a->strings["likes"] = "gusta de";
$a->strings["dislikes"] = "no gusta de";
+$a->strings["Invalid data packet"] = "Paquete de datos no válido";
+$a->strings["Unable to verify channel signature"] = "No ha sido posible de verificar la firma del canal";
+$a->strings["Unable to verify site signature for %s"] = "No ha sido posible de verificar la firma del sitio para %s";
+$a->strings["invalid target signature"] = "La firma recibida no es válida";
+$a->strings["Frequently"] = "Frecuentemente";
+$a->strings["Hourly"] = "Cada hora";
+$a->strings["Twice daily"] = "Dos veces al día";
+$a->strings["Daily"] = "Diariamente";
+$a->strings["Weekly"] = "Semanalmente";
+$a->strings["Monthly"] = "Mensualmente";
+$a->strings["Friendica"] = "Friendica";
+$a->strings["OStatus"] = "OStatus";
+$a->strings["RSS/Atom"] = "RSS/Atom";
+$a->strings["Email"] = "Correo electrónico";
+$a->strings["Diaspora"] = "Diaspora";
+$a->strings["Facebook"] = "Facebook";
+$a->strings["Zot"] = "Zot";
+$a->strings["LinkedIn"] = "LinkedIn";
+$a->strings["XMPP/IM"] = "XMPP/IM";
+$a->strings["MySpace"] = "MySpace";
+$a->strings["General Features"] = "Funcionalidades básicas";
+$a->strings["Content Expiration"] = "Caducidad del contenido";
+$a->strings["Remove posts/comments and/or private messages at a future time"] = "Eliminar publicaciones/comentarios y/o mensajes privados más adelante";
+$a->strings["Multiple Profiles"] = "Múltiples perfiles";
+$a->strings["Ability to create multiple profiles"] = "Capacidad de crear múltiples perfiles";
+$a->strings["Advanced Profiles"] = "Perfiles avanzados";
+$a->strings["Additional profile sections and selections"] = "Secciones y selecciones de perfil adicionales";
+$a->strings["Profile Import/Export"] = "Importar/Exportar perfil";
+$a->strings["Save and load profile details across sites/channels"] = "Guardar y cargar detalles del perfil a través de sitios/canales";
+$a->strings["Web Pages"] = "Páginas web";
+$a->strings["Provide managed web pages on your channel"] = "Proveer páginas web gestionadas en su canal";
+$a->strings["Hide Rating"] = "Ocultar las valoraciones";
+$a->strings["Hide the rating buttons on your channel and profile pages. Note: People can still rate you somewhere else."] = "Ocultar los botones de valoración en su canal y página de perfil. Tenga en cuenta, sin embargo, que la gente podrá expresar su valoración en otros lugares.";
+$a->strings["Private Notes"] = "Notas privadas";
+$a->strings["Enables a tool to store notes and reminders"] = "Activar una herramienta para almacenar notas y recordatorios";
+$a->strings["Navigation Channel Select"] = "Navegación por el selector de canales";
+$a->strings["Change channels directly from within the navigation dropdown menu"] = "Cambiar de canales directamente desde el menú de navegación desplegable";
+$a->strings["Photo Location"] = "Ubicación de las fotos";
+$a->strings["If location data is available on uploaded photos, link this to a map."] = "Si los datos de ubicación están disponibles en las fotos subidas, enlazar estas a un mapa.";
+$a->strings["Expert Mode"] = "Modo de experto";
+$a->strings["Enable Expert Mode to provide advanced configuration options"] = "Habilitar el modo de experto para acceder a opciones avanzadas de configuración";
+$a->strings["Premium Channel"] = "Canal premium";
+$a->strings["Allows you to set restrictions and terms on those that connect with your channel"] = "Le permite configurar restricciones y normas de uso a aquellos que conectan con su canal";
+$a->strings["Post Composition Features"] = "Opciones para la redacción de entradas";
+$a->strings["Use Markdown"] = "Usar Markdown";
+$a->strings["Allow use of \"Markdown\" to format posts"] = "Permitir el uso de \"Markdown\" para formatear publicaciones";
+$a->strings["Large Photos"] = "Fotos de gran tamaño";
+$a->strings["Include large (1024px) photo thumbnails in posts. If not enabled, use small (640px) photo thumbnails"] = "Incluir miniaturas de fotos grandes (1024px) en publicaciones. Si no está habilitado, usar miniaturas pequeñas (640px)";
+$a->strings["Channel Sources"] = "Orígenes de los contenidos del canal";
+$a->strings["Automatically import channel content from other channels or feeds"] = "Importar automáticamente contenido de otros canales o \"feeds\"";
+$a->strings["Even More Encryption"] = "Más cifrado todavía";
+$a->strings["Allow optional encryption of content end-to-end with a shared secret key"] = "Permitir cifrado adicional de contenido \"punto-a-punto\" con una clave secreta compartida.";
+$a->strings["Enable Voting Tools"] = "Permitir entradas con votación";
+$a->strings["Provide a class of post which others can vote on"] = "Proveer una clase de publicación en la que otros puedan votar";
+$a->strings["Delayed Posting"] = "Publicación aplazada";
+$a->strings["Allow posts to be published at a later date"] = "Permitir mensajes que se publicarán en una fecha posterior";
+$a->strings["Suppress Duplicate Posts/Comments"] = "Prevenir entradas o comentarios duplicados";
+$a->strings["Prevent posts with identical content to be published with less than two minutes in between submissions."] = "Prevenir que entradas con contenido idéntico se publiquen con menos de dos minutos de intervalo.";
+$a->strings["Network and Stream Filtering"] = "Filtrado del contenido";
+$a->strings["Search by Date"] = "Buscar por fecha";
+$a->strings["Ability to select posts by date ranges"] = "Capacidad de seleccionar entradas por rango de fechas";
+$a->strings["Collections (Privacy Groups)"] = "Colecciones (grupos privados)";
+$a->strings["Enable widget to display Network posts only from selected collections"] = "Habilitar la muestra de entradas eligiendo colecciones";
+$a->strings["Saved Searches"] = "Búsquedas guardadas";
+$a->strings["Save search terms for re-use"] = "Guardar términos de búsqueda para su reutilización";
+$a->strings["Network Personal Tab"] = "Actividad personal";
+$a->strings["Enable tab to display only Network posts that you've interacted on"] = "Habilitar una pestaña en la cual se muestren solo las entradas en las que ha participado.";
+$a->strings["Network New Tab"] = "Contenido nuevo";
+$a->strings["Enable tab to display all new Network activity"] = "Habilitar una pestaña en la que se muestre solo el contenido nuevo";
+$a->strings["Affinity Tool"] = "Herramienta de afinidad";
+$a->strings["Filter stream activity by depth of relationships"] = "Filtrar el contenido según la profundidad de las relaciones";
+$a->strings["Connection Filtering"] = "Filtrado de conexiones";
+$a->strings["Filter incoming posts from connections based on keywords/content"] = "Filtrar publicaciones entrantes de conexiones por palabras clave o contenido";
+$a->strings["Suggest Channels"] = "Sugerir canales";
+$a->strings["Show channel suggestions"] = "Mostrar sugerencias de canales";
+$a->strings["Post/Comment Tools"] = "Gestión de entradas y comentarios";
+$a->strings["Community Tagging"] = "Etiquetas de la comunidad";
+$a->strings["Ability to tag existing posts"] = "Capacidad de etiquetar entradas existentes";
+$a->strings["Post Categories"] = "Categorías de entradas";
+$a->strings["Add categories to your posts"] = "Añadir categorías a sus publicaciones";
+$a->strings["Ability to file posts under folders"] = "Capacidad de archivar entradas en carpetas";
+$a->strings["Dislike Posts"] = "Desagrado de publicaciones";
+$a->strings["Ability to dislike posts/comments"] = "Capacidad de mostrar desacuerdo con el contenido de entradas y comentarios";
+$a->strings["Star Posts"] = "Entradas destacadas";
+$a->strings["Ability to mark special posts with a star indicator"] = "Capacidad de marcar entradas destacadas con un indicador de estrella";
+$a->strings["Tag Cloud"] = "Nube de etiquetas";
+$a->strings["Provide a personal tag cloud on your channel page"] = "Proveer nube de etiquetas personal en su página de canal";
+$a->strings["Unable to obtain identity information from database"] = "No ha sido posible obtener información sobre la identidad desde la base de datos";
+$a->strings["Empty name"] = "Nombre vacío";
+$a->strings["Name too long"] = "Nombre demasiado largo";
+$a->strings["No account identifier"] = "Ningún identificador de la cuenta";
+$a->strings["Nickname is required."] = "Se requiere un sobrenombre (alias).";
+$a->strings["Reserved nickname. Please choose another."] = "Sobrenombre en uso. Por favor, elija otro.";
+$a->strings["Nickname has unsupported characters or is already being used on this site."] = "El alias contiene caracteres no admitidos o está ya en uso por otros usuarios de este sitio.";
+$a->strings["Unable to retrieve created identity"] = "No ha sido posible recuperar la identidad creada";
+$a->strings["Default Profile"] = "Perfil principal";
+$a->strings["Requested channel is not available."] = "El canal solicitado no está disponible.";
+$a->strings["Requested profile is not available."] = "El perfil solicitado no está disponible.";
+$a->strings["Change profile photo"] = "Cambiar la foto del perfil";
+$a->strings["Profiles"] = "Perfiles";
+$a->strings["Manage/edit profiles"] = "Administrar/editar perfiles";
+$a->strings["Create New Profile"] = "Crear un nuevo perfil";
+$a->strings["Profile Image"] = "Imagen del perfil";
+$a->strings["visible to everybody"] = "visible para cualquiera";
+$a->strings["Edit visibility"] = "Editar visibilidad";
+$a->strings["Gender:"] = "Género:";
+$a->strings["Status:"] = "Estado:";
+$a->strings["Homepage:"] = "Página personal:";
+$a->strings["Online Now"] = "Ahora en línea";
+$a->strings["g A l F d"] = "g A l d F";
+$a->strings["F d"] = "d F";
+$a->strings["[today]"] = "[hoy]";
+$a->strings["Birthday Reminders"] = "Recordatorios de cumpleaños";
+$a->strings["Birthdays this week:"] = "Cumpleaños de esta semana:";
+$a->strings["[No description]"] = "[Sin descripción]";
+$a->strings["Event Reminders"] = "Recordatorios de eventos";
+$a->strings["Events this week:"] = "Eventos de esta semana:";
+$a->strings["Full Name:"] = "Nombre completo:";
+$a->strings["Like this channel"] = "Me gusta este canal";
+$a->strings["j F, Y"] = "j F Y";
+$a->strings["j F"] = "j F";
+$a->strings["Birthday:"] = "Cumpleaños:";
+$a->strings["Age:"] = "Edad:";
+$a->strings["for %1\$d %2\$s"] = "por %1\$d %2\$s";
+$a->strings["Sexual Preference:"] = "Orientación sexual:";
+$a->strings["Hometown:"] = "Ciudad de origen:";
+$a->strings["Tags:"] = "Etiquetas:";
+$a->strings["Political Views:"] = "Posición política:";
+$a->strings["Religion:"] = "Religión:";
+$a->strings["About:"] = "Sobre mí:";
+$a->strings["Hobbies/Interests:"] = "Aficciones/Intereses:";
+$a->strings["Likes:"] = "Me gusta:";
+$a->strings["Dislikes:"] = "No me gusta:";
+$a->strings["Contact information and Social Networks:"] = "Información de contacto y redes sociales:";
+$a->strings["My other channels:"] = "Mis otros canales:";
+$a->strings["Musical interests:"] = "Intereses musicales:";
+$a->strings["Books, literature:"] = "Libros, literatura:";
+$a->strings["Television:"] = "Televisión:";
+$a->strings["Film/dance/culture/entertainment:"] = "Cine/danza/cultura/entretenimiento:";
+$a->strings["Love/Romance:"] = "Vida sentimental/amorosa:";
+$a->strings["Work/employment:"] = "Trabajo:";
+$a->strings["School/education:"] = "Estudios:";
+$a->strings["Like this thing"] = "Me gusta esto";
+$a->strings["cover photo"] = "Imagen de portada del perfil";
$a->strings["prev"] = "anterior";
$a->strings["first"] = "primera";
$a->strings["last"] = "última";
@@ -882,11 +859,7 @@ $a->strings["next"] = "próxima";
$a->strings["older"] = "más antiguas";
$a->strings["newer"] = "más recientes";
$a->strings["No connections"] = "Sin conexiones";
-$a->strings["%d Connection"] = array(
- 0 => "%d Conexión",
- 1 => "%d Conexiones",
-);
-$a->strings["View Connections"] = "Ver conexiones";
+$a->strings["View all %s connections"] = "Ver todas las %s conexiones";
$a->strings["Save"] = "Guardar";
$a->strings["poke"] = "un toque";
$a->strings["ping"] = "un \"ping\"";
@@ -938,10 +911,6 @@ $a->strings["Blocks"] = "Bloques";
$a->strings["Menus"] = "Menús";
$a->strings["Layouts"] = "Formato gráfico";
$a->strings["Pages"] = "Páginas";
-$a->strings["Invalid data packet"] = "Paquete de datos no válido";
-$a->strings["Unable to verify channel signature"] = "No ha sido posible de verificar la firma del canal";
-$a->strings["Unable to verify site signature for %s"] = "No ha sido posible de verificar la firma del sitio para %s";
-$a->strings["invalid target signature"] = "La firma recibida no es válida";
$a->strings["System"] = "Sistema";
$a->strings["Create Personal App"] = "Crear una aplicación personal";
$a->strings["Edit Personal App"] = "Editar una aplicación personal";
@@ -989,6 +958,7 @@ $a->strings["Chat Rooms"] = "Salas de chat";
$a->strings["Bookmarked Chatrooms"] = "Salas de chat preferidas";
$a->strings["Suggested Chatrooms"] = "Salas de chat sugeridas";
$a->strings["photo/image"] = "foto/imagen";
+$a->strings["Rating Tools"] = "Valoraciones";
$a->strings["Rate Me"] = "Valorar este canal";
$a->strings["View Ratings"] = "Mostrar las valoraciones";
$a->strings["Public Hubs"] = "Servidores públicos";
@@ -1012,6 +982,22 @@ $a->strings["Plugin Features"] = "Extensiones";
$a->strings["User registrations waiting for confirmation"] = "Registros de usuarios pendientes de confirmación";
$a->strings["View Photo"] = "Ver foto";
$a->strings["Edit Album"] = "Editar álbum";
+$a->strings["Permission denied"] = "Permiso denegado";
+$a->strings["(Unknown)"] = "(Desconocido)";
+$a->strings["Visible to anybody on the internet."] = "Visible para cualquiera en internet.";
+$a->strings["Visible to you only."] = "Visible sólo para usted.";
+$a->strings["Visible to anybody in this network."] = "Visible para cualquiera en esta red.";
+$a->strings["Visible to anybody authenticated."] = "Visible para cualquiera que haya sido autenticado.";
+$a->strings["Visible to anybody on %s."] = "Visible para cualquiera en %s.";
+$a->strings["Visible to all connections."] = "Visible para todas las conexiones.";
+$a->strings["Visible to approved connections."] = "Visible para las conexiones permitidas.";
+$a->strings["Visible to specific connections."] = "Visible para conexiones específicas.";
+$a->strings["Item not found."] = "Elemento no encontrado.";
+$a->strings["Collection not found."] = "Colección no encontrada.";
+$a->strings["Collection is empty."] = "La colección está vacía.";
+$a->strings["Collection: %s"] = "Colección: %s";
+$a->strings["Connection: %s"] = "Conexión: %s";
+$a->strings["Connection not found."] = "Conexión no encontrada";
$a->strings["Not Found"] = "No encontrado";
$a->strings["Page not found."] = "Página no encontrada.";
$a->strings["Some blurb about what to do when you're new here"] = "Algunas propuestas para el nuevo usuario sobre qué se puede hacer aquí";
@@ -1100,7 +1086,7 @@ $a->strings["Poll interval"] = "Intervalo de sondeo";
$a->strings["Delay background polling processes by this many seconds to reduce system load. If 0, use delivery interval."] = "Retrasar el sondeo en segundo plano, en esta cantidad de segundos, para reducir la carga del sistema. Si es 0, usar el intervalo de transmisión.";
$a->strings["Maximum Load Average"] = "Carga media máxima";
$a->strings["Maximum system load before delivery and poll processes are deferred - default 50."] = "Carga máxima del sistema antes de que los procesos de transmisión y sondeo se hayan retardado - por defecto, 50.";
-$a->strings["Expiration period in days for imported (matrix/network) content"] = "Periodo de caducidad en días para el contenido importado (red)";
+$a->strings["Expiration period in days for imported (grid/network) content"] = "Caducidad del contenido importado de otros sitios (en días)";
$a->strings["0 for no expiration of imported content"] = "0 para que no caduque el contenido importado";
$a->strings["Off"] = "Desactivado";
$a->strings["On"] = "Activado";
@@ -1276,13 +1262,73 @@ $a->strings["Only show blocked connections"] = "Mostrar solo las conexiones bloq
$a->strings["Only show ignored connections"] = "Mostrar solo conexiones ignoradas";
$a->strings["Only show archived connections"] = "Mostrar solo las conexiones archivadas";
$a->strings["Only show hidden connections"] = "Mostrar solo las conexiones ocultas";
-$a->strings["Pending"] = "Pendiente";
+$a->strings["Pending approval"] = "Pendiente de aprobación";
$a->strings["%1\$s [%2\$s]"] = "%1\$s [%2\$s]";
$a->strings["Edit connection"] = "Editar conexión";
$a->strings["Delete connection"] = "Eliminar conexión";
+$a->strings["Channel address"] = "Dirección del canal";
+$a->strings["Network"] = "Red";
$a->strings["Connected"] = "Conectado/a";
+$a->strings["Approve connection"] = "Aprobar esta conexión";
+$a->strings["Recent activity"] = "Actividad reciente";
$a->strings["Search your connections"] = "Buscar sus conexiones";
$a->strings["Connections search"] = "Buscar conexiones";
+$a->strings["Could not access contact record."] = "No se ha podido acceder al registro de contacto.";
+$a->strings["Could not locate selected profile."] = "No se ha podido localizar el perfil seleccionado.";
+$a->strings["Connection updated."] = "Conexión actualizada.";
+$a->strings["Failed to update connection record."] = "Error al actualizar el registro de la conexión.";
+$a->strings["is now connected to"] = "ahora está conectado/a";
+$a->strings["Could not access address book record."] = "No se pudo acceder al registro en su libreta de direcciones.";
+$a->strings["Refresh failed - channel is currently unavailable."] = "Recarga fallida - no se puede encontrar el canal en este momento.";
+$a->strings["Unable to set address book parameters."] = "No ha sido posible establecer los parámetros de la libreta de direcciones.";
+$a->strings["Connection has been removed."] = "La conexión ha sido eliminada.";
+$a->strings["View %s's profile"] = "Ver el perfil de %s";
+$a->strings["Refresh Permissions"] = "Recargar los permisos";
+$a->strings["Fetch updated permissions"] = "Obtener los permisos actualizados";
+$a->strings["Recent Activity"] = "Actividad reciente";
+$a->strings["View recent posts and comments"] = "Ver publicaciones y comentarios recientes";
+$a->strings["Block (or Unblock) all communications with this connection"] = "Bloquear (o desbloquear) todas las comunicaciones con esta conexión";
+$a->strings["This connection is blocked!"] = "¡Esta conexión está bloqueada!";
+$a->strings["Unignore"] = "Dejar de ignorar";
+$a->strings["Ignore"] = "Ignorar";
+$a->strings["Ignore (or Unignore) all inbound communications from this connection"] = "Ignorar (o dejar de ignorar) todas las comunicaciones entrantes de esta conexión";
+$a->strings["This connection is ignored!"] = "¡Esta conexión es ignorada!";
+$a->strings["Unarchive"] = "Desarchivar";
+$a->strings["Archive"] = "Archivar";
+$a->strings["Archive (or Unarchive) this connection - mark channel dead but keep content"] = "Archiva (o desarchiva) esta conexión - marca el canal como muerto aunque mantiene sus contenidos";
+$a->strings["This connection is archived!"] = "¡Esta conexión esta archivada!";
+$a->strings["Unhide"] = "Mostrar";
+$a->strings["Hide"] = "Ocultar";
+$a->strings["Hide or Unhide this connection from your other connections"] = "Ocultar o mostrar esta conexión a sus otras conexiones";
+$a->strings["This connection is hidden!"] = "¡Esta conexión está oculta!";
+$a->strings["Delete this connection"] = "Eliminar esta conexión";
+$a->strings["Approve this connection"] = "Aprobar esta conexión";
+$a->strings["Accept connection to allow communication"] = "Aceptar la conexión para permitir la comunicación";
+$a->strings["Set Affinity"] = "Ajustar la afinidad";
+$a->strings["Set Profile"] = "Ajustar el perfil";
+$a->strings["Set Affinity & Profile"] = "Ajustar la afinidad y el perfil";
+$a->strings["none"] = "-";
+$a->strings["Apply these permissions automatically"] = "Aplicar estos permisos automaticamente";
+$a->strings["This connection's primary address is"] = "La dirección primaria de esta conexión es";
+$a->strings["Available locations:"] = "Ubicaciones disponibles:";
+$a->strings["The permissions indicated on this page will be applied to all new connections."] = "Los permisos indicados en esta página serán aplicados en todas las nuevas conexiones.";
+$a->strings["Slide to adjust your degree of friendship"] = "Deslizar para ajustar el grado de amistad";
+$a->strings["Slide to adjust your rating"] = "Deslizar para ajustar su valoración";
+$a->strings["Optionally explain your rating"] = "Opcionalmente, puede explicar su valoración";
+$a->strings["Custom Filter"] = "Filtro personalizado";
+$a->strings["Only import posts with this text"] = "Importar solo entradas que contengan este texto";
+$a->strings["words one per line or #tags or /patterns/ or lang=xx, leave blank to import all posts"] = "Una sola opción por línea: palabras, #etiquetas, /patrones/ o lang=xx. Dejar en blanco para importarlo todo";
+$a->strings["Do not import posts with this text"] = "No importar entradas que contengan este texto";
+$a->strings["This information is public!"] = "¡Esta información es pública!";
+$a->strings["Connection Pending Approval"] = "Conexión pendiente de aprobación";
+$a->strings["inherited"] = "heredado";
+$a->strings["Please choose the profile you would like to display to %s when viewing your profile securely."] = "Por favor, escoja el perfil que quiere mostrar a %s cuando esté viendo su perfil de forma segura.";
+$a->strings["Their Settings"] = "Sus ajustes";
+$a->strings["My Settings"] = "Mis ajustes";
+$a->strings["Individual Permissions"] = "Permisos individuales";
+$a->strings["Some permissions may be inherited from your channel's <a href=\"settings\"><strong>privacy settings</strong></a>, which have higher priority than individual settings. You can <strong>not</strong> change those settings here."] = "Algunos permisos pueden ser heredados de los <a href=\"settings\"><strong>ajustes de privacidad</strong></a> de sus canales, los cuales tienen una prioridad más alta que los ajustes individuales. <strong>No</strong> puede cambiar estos ajustes aquí.";
+$a->strings["Some permissions may be inherited from your channel's <a href=\"settings\"><strong>privacy settings</strong></a>, which have higher priority than individual settings. You can change those settings here but they wont have any impact unless the inherited setting changes."] = "Algunos permisos pueden ser heredados de los <a href=\"settings\"><strong>ajustes de privacidad</strong></a> de sus canales, los cuales tienen una prioridad más alta que los ajustes individuales. Puede cambiar estos ajustes aquí, pero no tendrán ningún consecuencia hasta que cambie los ajustes heredados.";
+$a->strings["Last update:"] = "Última actualización:";
$a->strings["\$Projectname channel"] = "Canal \$Projectname";
$a->strings["Public access denied."] = "Acceso público denegado.";
$a->strings["%d rating"] = array(
@@ -1509,21 +1555,6 @@ $a->strings["Sync now"] = "Sincronizar ahora";
$a->strings["Please wait several minutes between consecutive operations."] = "Por favor, espere algunos minutos entre operaciones consecutivas.";
$a->strings["When possible, drop a location by logging into that website/hub and removing your channel."] = "Cuando sea posible, elimine una ubicación iniciando sesión en el sitio web o \"hub\" y borrando su canal.";
$a->strings["Use this form to drop the location if the hub is no longer operating."] = "Utilice este formulario para eliminar la dirección si el \"hub\" no está funcionando desde hace tiempo.";
-$a->strings["No valid account found."] = "No se ha encontrado una cuenta válida.";
-$a->strings["Password reset request issued. Check your email."] = "Se ha recibido una solicitud de restablecimiento de contraseña. Consulte su correo electrónico.";
-$a->strings["Site Member (%s)"] = "Usuario del sitio (%s)";
-$a->strings["Password reset requested at %s"] = "Se ha solicitado restablecer la contraseña en %s";
-$a->strings["Request could not be verified. (You may have previously submitted it.) Password reset failed."] = "La solicitud no ha podido ser verificada. (Puede que la haya enviado con anterioridad) El restablecimiento de la contraseña ha fallado.";
-$a->strings["Your password has been reset as requested."] = "Su contraseña ha sido restablecida según lo solicitó.";
-$a->strings["Your new password is"] = "Su nueva contraseña es";
-$a->strings["Save or copy your new password - and then"] = "Guarde o copie su nueva contraseña - y después";
-$a->strings["click here to login"] = "pulse aquí para conectarse";
-$a->strings["Your password may be changed from the <em>Settings</em> page after successful login."] = "Puede cambiar la contraseña en la página <em>Ajustes</em> una vez iniciada la sesión.";
-$a->strings["Your password has changed at %s"] = "Su contraseña en %s ha sido cambiada";
-$a->strings["Forgot your Password?"] = "¿Ha olvidado su contraseña?";
-$a->strings["Enter your email address and submit to have your password reset. Then check your email for further instructions."] = "Introduzca y envíe su dirección de correo electrónico para el restablecimiento de su contraseña. Luego revise su correo para obtener más instrucciones.";
-$a->strings["Email Address"] = "Dirección de correo electrónico";
-$a->strings["Reset"] = "Reiniciar";
$a->strings["Hub not found."] = "Servidor no encontrado";
$a->strings["Unable to lookup recipient."] = "Imposible asociar a un destinatario.";
$a->strings["Unable to communicate with requested channel."] = "Imposible comunicar con el canal solicitado.";
@@ -1631,7 +1662,6 @@ $a->strings["Channel Type"] = "Tipo de canal";
$a->strings["Read more about roles"] = "Leer más sobre los roles";
$a->strings["Invalid request identifier."] = "Petición inválida del identificador.";
$a->strings["Discard"] = "Descartar";
-$a->strings["Ignore"] = "Ignorar";
$a->strings["No more system notifications."] = "No hay más notificaciones del sistema";
$a->strings["System Notifications"] = "Notificaciones de sistema";
$a->strings["Unable to find your hub."] = "No se puede encontrar su servidor.";
@@ -1794,7 +1824,6 @@ $a->strings["Remote Channel [%s] (not yet known on this site)"] = "Canal remoto
$a->strings["Rating (this information is public)"] = "Valoración (esta información es pública)";
$a->strings["Optionally explain your rating (this information is public)"] = "Opcionalmente puede explicar su valoración (esta información es pública)";
$a->strings["No ratings"] = "Ninguna valoración";
-$a->strings["Ratings"] = "Valoraciones";
$a->strings["Rating: "] = "Valoración:";
$a->strings["Website: "] = "Sitio web:";
$a->strings["Description: "] = "Descripción:";
@@ -1898,10 +1927,10 @@ $a->strings["Link post titles to source"] = "Enlazar título de la publicación
$a->strings["System Page Layout Editor - (advanced)"] = "Editor de diseño de página del sistema - (avanzado)";
$a->strings["Use blog/list mode on channel page"] = "Usar modo blog/lista en la página de inicio del canal";
$a->strings["(comments displayed separately)"] = "(comentarios mostrados de forma separada)";
-$a->strings["Use blog/list mode on matrix page"] = "Mostrar la red en modo blog/lista";
+$a->strings["Use blog/list mode on grid page"] = "Mostrar mi red en modo blog";
$a->strings["Channel page max height of content (in pixels)"] = "Altura máxima del contenido de la página del canal (en píxeles)";
$a->strings["click to expand content exceeding this height"] = "Pulsar para expandir el contenido que exceda de esta altura";
-$a->strings["Matrix page max height of content (in pixels)"] = "Altura máxima del contenido de la página de su red (en píxeles)";
+$a->strings["Grid page max height of content (in pixels)"] = "Altura máxima del contenido de mi red (en píxeles)";
$a->strings["Nobody except yourself"] = "Nadie excepto usted";
$a->strings["Only those you specifically allow"] = "Solo aquellos a los que usted permita explícitamente";
$a->strings["Approved connections"] = "Conexiones aprobadas";
@@ -1956,7 +1985,7 @@ $a->strings["You receive a friend suggestion"] = "Reciba una sugerencia de amist
$a->strings["You are tagged in a post"] = "Usted sea etiquetado en una publicación";
$a->strings["You are poked/prodded/etc. in a post"] = "Reciba un toque o incitación en una publicación";
$a->strings["Show visual notifications including:"] = "Mostrar notificaciones visuales que incluyan:";
-$a->strings["Unseen matrix activity"] = "Actividad no vista en la red";
+$a->strings["Unseen grid activity"] = "Nueva actividad en la red";
$a->strings["Unseen channel activity"] = "Actividad no vista en el canal";
$a->strings["Unseen private messages"] = "Mensajes privados no leídos";
$a->strings["Recommended"] = "Recomendado";
@@ -2067,64 +2096,22 @@ $a->strings["The database configuration file \".htconfig.php\" could not be writ
$a->strings["Errors encountered creating database tables."] = "Se han encontrado errores al crear las tablas de la base de datos.";
$a->strings["<h1>What next</h1>"] = "<h1>Siguiente paso</h1>";
$a->strings["IMPORTANT: You will need to [manually] setup a scheduled task for the poller."] = "IMPORTANTE: Debe crear [manualmente] una tarea programada para el \"poller\".";
-$a->strings["Could not access contact record."] = "No se ha podido acceder al registro de contacto.";
-$a->strings["Could not locate selected profile."] = "No se ha podido localizar el perfil seleccionado.";
-$a->strings["Connection updated."] = "Conexión actualizada.";
-$a->strings["Failed to update connection record."] = "Error al actualizar el registro de la conexión.";
-$a->strings["is now connected to"] = "ahora está conectado/a";
-$a->strings["Could not access address book record."] = "No se pudo acceder al registro en su libreta de direcciones.";
-$a->strings["Refresh failed - channel is currently unavailable."] = "Recarga fallida - no se puede encontrar el canal en este momento.";
-$a->strings["Unable to set address book parameters."] = "No ha sido posible establecer los parámetros de la libreta de direcciones.";
-$a->strings["Connection has been removed."] = "La conexión ha sido eliminada.";
-$a->strings["View %s's profile"] = "Ver el perfil de %s";
-$a->strings["Refresh Permissions"] = "Recargar los permisos";
-$a->strings["Fetch updated permissions"] = "Obtener los permisos actualizados";
-$a->strings["Recent Activity"] = "Actividad reciente";
-$a->strings["View recent posts and comments"] = "Ver publicaciones y comentarios recientes";
-$a->strings["Block (or Unblock) all communications with this connection"] = "Bloquear (o desbloquear) todas las comunicaciones con esta conexión";
-$a->strings["This connection is blocked!"] = "¡Esta conexión está bloqueada!";
-$a->strings["Unignore"] = "Dejar de ignorar";
-$a->strings["Ignore (or Unignore) all inbound communications from this connection"] = "Ignorar (o dejar de ignorar) todas las comunicaciones entrantes de esta conexión";
-$a->strings["This connection is ignored!"] = "¡Esta conexión es ignorada!";
-$a->strings["Unarchive"] = "Desarchivar";
-$a->strings["Archive"] = "Archivar";
-$a->strings["Archive (or Unarchive) this connection - mark channel dead but keep content"] = "Archiva (o desarchiva) esta conexión - marca el canal como muerto aunque mantiene sus contenidos";
-$a->strings["This connection is archived!"] = "¡Esta conexión esta archivada!";
-$a->strings["Unhide"] = "Mostrar";
-$a->strings["Hide"] = "Ocultar";
-$a->strings["Hide or Unhide this connection from your other connections"] = "Ocultar o mostrar esta conexión a sus otras conexiones";
-$a->strings["This connection is hidden!"] = "¡Esta conexión está oculta!";
-$a->strings["Delete this connection"] = "Eliminar esta conexión";
-$a->strings["Approve this connection"] = "Aprobar esta conexión";
-$a->strings["Accept connection to allow communication"] = "Aceptar la conexión para permitir la comunicación";
-$a->strings["Set Affinity"] = "Ajustar la afinidad";
-$a->strings["Set Profile"] = "Ajustar el perfil";
-$a->strings["Set Affinity & Profile"] = "Ajustar la afinidad y el perfil";
-$a->strings["none"] = "-";
-$a->strings["Apply these permissions automatically"] = "Aplicar estos permisos automaticamente";
-$a->strings["This connection's primary address is"] = "La dirección primaria de esta conexión es";
-$a->strings["Available locations:"] = "Ubicaciones disponibles:";
-$a->strings["The permissions indicated on this page will be applied to all new connections."] = "Los permisos indicados en esta página serán aplicados en todas las nuevas conexiones.";
-$a->strings["Slide to adjust your degree of friendship"] = "Deslizar para ajustar el grado de amistad";
-$a->strings["Slide to adjust your rating"] = "Deslizar para ajustar su valoración";
-$a->strings["Optionally explain your rating"] = "Opcionalmente, puede explicar su valoración";
-$a->strings["Custom Filter"] = "Filtro personalizado";
-$a->strings["Only import posts with this text"] = "Importar solo entradas que contengan este texto";
-$a->strings["words one per line or #tags or /patterns/ or lang=xx, leave blank to import all posts"] = "Una sola opción por línea: palabras, #etiquetas, /patrones/ o lang=xx. Dejar en blanco para importarlo todo";
-$a->strings["Do not import posts with this text"] = "No importar entradas que contengan este texto";
-$a->strings["This information is public!"] = "¡Esta información es pública!";
-$a->strings["Connection Pending Approval"] = "Conexión pendiente de aprobación";
-$a->strings["Connection Request"] = "Solicitud de conexión";
-$a->strings["(%s) would like to connect with you. Please approve this connection to allow communication."] = "(%s) desearía conectar con usted. por favor, apruebe esta conexión para permitir la comunicación.";
-$a->strings["Approve Later"] = "Aprobar más tarde";
-$a->strings["inherited"] = "heredado";
-$a->strings["Please choose the profile you would like to display to %s when viewing your profile securely."] = "Por favor, escoja el perfil que quiere mostrar a %s cuando esté viendo su perfil de forma segura.";
-$a->strings["Their Settings"] = "Sus ajustes";
-$a->strings["My Settings"] = "Mis ajustes";
-$a->strings["Individual Permissions"] = "Permisos individuales";
-$a->strings["Some permissions may be inherited from your channel's <a href=\"settings\"><strong>privacy settings</strong></a>, which have higher priority than individual settings. You can <strong>not</strong> change those settings here."] = "Algunos permisos pueden ser heredados de los <a href=\"settings\"><strong>ajustes de privacidad</strong></a> de sus canales, los cuales tienen una prioridad más alta que los ajustes individuales. <strong>No</strong> puede cambiar estos ajustes aquí.";
-$a->strings["Some permissions may be inherited from your channel's <a href=\"settings\"><strong>privacy settings</strong></a>, which have higher priority than individual settings. You can change those settings here but they wont have any impact unless the inherited setting changes."] = "Algunos permisos pueden ser heredados de los <a href=\"settings\"><strong>ajustes de privacidad</strong></a> de sus canales, los cuales tienen una prioridad más alta que los ajustes individuales. Puede cambiar estos ajustes aquí, pero no tendrán ningún consecuencia hasta que cambie los ajustes heredados.";
-$a->strings["Last update:"] = "Última actualización:";
+$a->strings["No valid account found."] = "No se ha encontrado una cuenta válida.";
+$a->strings["Password reset request issued. Check your email."] = "Se ha recibido una solicitud de restablecimiento de contraseña. Consulte su correo electrónico.";
+$a->strings["Site Member (%s)"] = "Usuario del sitio (%s)";
+$a->strings["Password reset requested at %s"] = "Se ha solicitado restablecer la contraseña en %s";
+$a->strings["Request could not be verified. (You may have previously submitted it.) Password reset failed."] = "La solicitud no ha podido ser verificada. (Puede que la haya enviado con anterioridad) El restablecimiento de la contraseña ha fallado.";
+$a->strings["Password Reset"] = "Restablecer la contraseña";
+$a->strings["Your password has been reset as requested."] = "Su contraseña ha sido restablecida según lo solicitó.";
+$a->strings["Your new password is"] = "Su nueva contraseña es";
+$a->strings["Save or copy your new password - and then"] = "Guarde o copie su nueva contraseña - y después";
+$a->strings["click here to login"] = "pulse aquí para conectarse";
+$a->strings["Your password may be changed from the <em>Settings</em> page after successful login."] = "Puede cambiar la contraseña en la página <em>Ajustes</em> una vez iniciada la sesión.";
+$a->strings["Your password has changed at %s"] = "Su contraseña en %s ha sido cambiada";
+$a->strings["Forgot your Password?"] = "¿Ha olvidado su contraseña?";
+$a->strings["Enter your email address and submit to have your password reset. Then check your email for further instructions."] = "Introduzca y envíe su dirección de correo electrónico para el restablecimiento de su contraseña. Luego revise su correo para obtener más instrucciones.";
+$a->strings["Email Address"] = "Dirección de correo electrónico";
+$a->strings["Reset"] = "Reiniciar";
$a->strings["Files: shared with me"] = "Ficheros: compartidos conmigo";
$a->strings["NEW"] = "NUEVO";
$a->strings["Remove all files"] = "Eliminar todos los ficheros";
@@ -2188,6 +2175,7 @@ $a->strings["To select all posts for a given month, such as January of this year
$a->strings["These content files may be imported or restored by visiting <a href=\"%1\$s\">%2\$s</a> on any site containing your channel. For best results please import or restore these in date order (oldest first)."] = "Estos ficheros pueden ser importados o restaurados visitando <a href=\"%1\$s\">%2\$s</a> o cualquier sitio que contenga su canal. Para obtener los mejores resultados, por favor, importar o restaurar estos ficheros en orden de fecha (la más antigua primero).";
$a->strings["No connections."] = "Sin conexiones.";
$a->strings["Visit %s's profile [%s]"] = "Visitar el perfil de %s [%s]";
+$a->strings["View Connections"] = "Ver conexiones";
$a->strings["Source of Item"] = "Origen del elemento";
$a->strings["Page Title"] = "Título de página";
$a->strings["Xchan Lookup"] = "Búsqueda de canales";
@@ -2228,3 +2216,14 @@ $a->strings["Left align page content"] = "Alinear a la izquierda el contenido de
$a->strings["Set minimum opacity of nav bar - to hide it"] = "Ajustar la opacidad mínima de la barra de navegación - para ocultarla";
$a->strings["Set size of conversation author photo"] = "Ajustar el tamaño de la foto del autor de la conversación";
$a->strings["Set size of followup author photos"] = "Ajustar el tamaño de foto de los seguidores del autor";
+$a->strings["Update %s failed. See error logs."] = "La actualización %s ha fallado. Mire el informe de errores.";
+$a->strings["Update Error at %s"] = "Error de actualización en %s";
+$a->strings["Create an account to access services and applications within the Hubzilla"] = "Crear una cuenta para acceder a los servicios y aplicaciones dentro de Hubzilla";
+$a->strings["Password"] = "Contraseña";
+$a->strings["Remember me"] = "Recordarme";
+$a->strings["Forgot your password?"] = "¿Olvidó su contraseña?";
+$a->strings["toggle mobile"] = "cambiar a modo móvil";
+$a->strings["Website SSL certificate is not valid. Please correct."] = "El certificado SSL del sitio web no es válido. Por favor, solucione el problema.";
+$a->strings["[hubzilla] Website SSL error for %s"] = "[hubzilla] Error SSL del sitio web en %s";
+$a->strings["Cron/Scheduled tasks not running."] = "Las tareas del Planificador/Cron no están funcionando.";
+$a->strings["[hubzilla] Cron tasks not running on %s"] = "[hubzilla] Las tareas de Cron no están funcionando en %s";
diff --git a/view/nl/hmessages.po b/view/nl/hmessages.po
index 9bbdbdf26..511368a1f 100644
--- a/view/nl/hmessages.po
+++ b/view/nl/hmessages.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Redmatrix\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-01-15 00:03-0800\n"
-"PO-Revision-Date: 2016-01-17 18:45+0000\n"
+"POT-Creation-Date: 2016-01-22 00:03-0800\n"
+"PO-Revision-Date: 2016-01-22 14:31+0000\n"
"Last-Translator: jeroenpraat <jeroenpraat@xs4all.nl>\n"
"Language-Team: Dutch (http://www.transifex.com/Friendica/red-matrix/language/nl/)\n"
"MIME-Version: 1.0\n"
@@ -30,110 +30,8 @@ msgstr "Authenticatie op afstand geblokkeerd. Je bent lokaal op deze hub ingelog
msgid "Welcome %s. Remote authentication successful."
msgstr "Welkom %s. Authenticatie op afstand geslaagd."
-#: ../../boot.php:1319
-#, php-format
-msgid "Update %s failed. See error logs."
-msgstr "Update %s mislukt. Zie foutenlogboek."
-
-#: ../../boot.php:1322
-#, php-format
-msgid "Update Error at %s"
-msgstr "Update-fout op %s"
-
-#: ../../boot.php:1489
-msgid ""
-"Create an account to access services and applications within the Hubzilla"
-msgstr "Maak een account aan om toegang te krijgen tot diensten en toepassingen van Hubzilla"
-
-#: ../../boot.php:1490 ../../include/nav.php:149 ../../mod/register.php:264
-msgid "Register"
-msgstr "Registreren"
-
-#: ../../boot.php:1507 ../../include/nav.php:82 ../../include/nav.php:114
-msgid "Logout"
-msgstr "Uitloggen"
-
-#: ../../boot.php:1508 ../../include/apps.php:131 ../../include/nav.php:111
-msgid "Login"
-msgstr "Inloggen"
-
-#: ../../boot.php:1510 ../../include/contact_selectors.php:79
-#: ../../mod/admin.php:891 ../../mod/admin.php:900 ../../mod/id.php:15
-#: ../../mod/id.php:16
-msgid "Email"
-msgstr "E-mail"
-
-#: ../../boot.php:1511
-msgid "Password"
-msgstr "Wachtwoord"
-
-#: ../../boot.php:1512
-msgid "Remember me"
-msgstr "Aangemeld blijven"
-
-#: ../../boot.php:1512 ../../include/dir_fns.php:141
-#: ../../include/dir_fns.php:142 ../../include/dir_fns.php:143
-#: ../../mod/admin.php:421 ../../mod/api.php:102 ../../mod/events.php:447
-#: ../../mod/events.php:448 ../../mod/events.php:457
-#: ../../mod/filestorage.php:151 ../../mod/filestorage.php:159
-#: ../../mod/menu.php:96 ../../mod/menu.php:153 ../../mod/mitem.php:154
-#: ../../mod/mitem.php:155 ../../mod/mitem.php:228 ../../mod/mitem.php:229
-#: ../../mod/photos.php:626 ../../mod/removeme.php:60
-#: ../../mod/settings.php:577 ../../mod/connedit.php:644
-#: ../../mod/connedit.php:693 ../../view/theme/redbasic/php/config.php:104
-#: ../../view/theme/redbasic/php/config.php:129
-msgid "No"
-msgstr "Nee"
-
-#: ../../boot.php:1512 ../../include/dir_fns.php:141
-#: ../../include/dir_fns.php:142 ../../include/dir_fns.php:143
-#: ../../mod/admin.php:423 ../../mod/api.php:101 ../../mod/events.php:447
-#: ../../mod/events.php:448 ../../mod/events.php:457
-#: ../../mod/filestorage.php:151 ../../mod/filestorage.php:159
-#: ../../mod/menu.php:96 ../../mod/menu.php:153 ../../mod/mitem.php:154
-#: ../../mod/mitem.php:155 ../../mod/mitem.php:228 ../../mod/mitem.php:229
-#: ../../mod/photos.php:626 ../../mod/removeme.php:60
-#: ../../mod/settings.php:577 ../../view/theme/redbasic/php/config.php:104
-#: ../../view/theme/redbasic/php/config.php:129
-msgid "Yes"
-msgstr "Ja"
-
-#: ../../boot.php:1515
-msgid "Forgot your password?"
-msgstr "Wachtwoord vergeten?"
-
-#: ../../boot.php:1516 ../../mod/lostpass.php:86
-msgid "Password Reset"
-msgstr "Wachtwoord vergeten?"
-
-#: ../../boot.php:2137
-msgid "toggle mobile"
-msgstr "mobiele weergave omschakelen"
-
-#: ../../boot.php:2289
-msgid "Website SSL certificate is not valid. Please correct."
-msgstr "Het SSL-certificaat van deze website is ongeldig. Corrigeer dit a.u.b."
-
-#: ../../boot.php:2292
-#, php-format
-msgid "[hubzilla] Website SSL error for %s"
-msgstr "[hubzilla] Probleem met SSL-certificaat voor %s"
-
-#: ../../boot.php:2329
-msgid "Cron/Scheduled tasks not running."
-msgstr "Cron is niet actief"
-
-#: ../../boot.php:2330 ../../include/datetime.php:263
-msgid "never"
-msgstr "nooit"
-
-#: ../../boot.php:2333
-#, php-format
-msgid "[hubzilla] Cron tasks not running on %s"
-msgstr "[hubzilla] Cron-taken zijn niet actief op %s"
-
-#: ../../include/Contact.php:101 ../../include/conversation.php:953
-#: ../../include/identity.php:947 ../../include/widgets.php:137
+#: ../../include/Contact.php:101 ../../include/conversation.php:961
+#: ../../include/identity.php:949 ../../include/widgets.php:137
#: ../../include/widgets.php:175 ../../mod/directory.php:318
#: ../../mod/match.php:64 ../../mod/suggest.php:52
msgid "Connect"
@@ -171,22 +69,22 @@ msgstr "Niet voor iedereen zichtbaar"
#: ../../include/ItemObject.php:100 ../../include/RedDAV/RedBrowser.php:240
#: ../../include/apps.php:259 ../../include/menu.php:108
#: ../../include/page_widgets.php:8 ../../include/page_widgets.php:36
-#: ../../mod/blocks.php:153 ../../mod/connections.php:262
-#: ../../mod/connections.php:281 ../../mod/connections.php:301
-#: ../../mod/editblock.php:135 ../../mod/editlayout.php:134
-#: ../../mod/editpost.php:112 ../../mod/editwebpage.php:176
-#: ../../mod/layouts.php:183 ../../mod/menu.php:108 ../../mod/settings.php:648
-#: ../../mod/thing.php:257 ../../mod/webpages.php:181
+#: ../../mod/blocks.php:153 ../../mod/connections.php:284
+#: ../../mod/connections.php:304 ../../mod/editblock.php:135
+#: ../../mod/editlayout.php:134 ../../mod/editpost.php:112
+#: ../../mod/editwebpage.php:176 ../../mod/layouts.php:183
+#: ../../mod/menu.php:108 ../../mod/settings.php:648 ../../mod/thing.php:257
+#: ../../mod/webpages.php:181
msgid "Edit"
msgstr "Bewerken"
#: ../../include/ItemObject.php:120 ../../include/RedDAV/RedBrowser.php:241
#: ../../include/apps.php:260 ../../include/conversation.php:657
#: ../../mod/admin.php:895 ../../mod/admin.php:1054 ../../mod/blocks.php:155
-#: ../../mod/connections.php:263 ../../mod/editblock.php:181
-#: ../../mod/editlayout.php:179 ../../mod/editwebpage.php:223
-#: ../../mod/group.php:173 ../../mod/photos.php:1126
-#: ../../mod/settings.php:649 ../../mod/connedit.php:560
+#: ../../mod/connections.php:259 ../../mod/connedit.php:560
+#: ../../mod/editblock.php:181 ../../mod/editlayout.php:179
+#: ../../mod/editwebpage.php:223 ../../mod/group.php:173
+#: ../../mod/photos.php:1126 ../../mod/settings.php:649
#: ../../mod/thing.php:258 ../../mod/webpages.php:183
msgid "Delete"
msgstr "Verwijderen"
@@ -224,13 +122,13 @@ msgid "I abstain"
msgstr "Onthouding"
#: ../../include/ItemObject.php:175 ../../include/ItemObject.php:187
-#: ../../include/conversation.php:1697 ../../mod/photos.php:1079
+#: ../../include/conversation.php:1707 ../../mod/photos.php:1079
#: ../../mod/photos.php:1091
msgid "View all"
msgstr "Toon alles"
-#: ../../include/ItemObject.php:179 ../../include/conversation.php:1721
-#: ../../include/identity.php:1258 ../../include/taxonomy.php:414
+#: ../../include/ItemObject.php:179 ../../include/conversation.php:1731
+#: ../../include/taxonomy.php:414 ../../include/identity.php:1262
#: ../../mod/photos.php:1083
msgctxt "noun"
msgid "Like"
@@ -238,7 +136,7 @@ msgid_plural "Likes"
msgstr[0] "vindt dit leuk"
msgstr[1] "vinden dit leuk"
-#: ../../include/ItemObject.php:184 ../../include/conversation.php:1724
+#: ../../include/ItemObject.php:184 ../../include/conversation.php:1734
#: ../../mod/photos.php:1088
msgctxt "noun"
msgid "Dislike"
@@ -373,7 +271,7 @@ msgid "Close"
msgstr "Sluiten"
#: ../../include/ItemObject.php:389 ../../include/conversation.php:740
-#: ../../include/conversation.php:1227 ../../mod/editblock.php:150
+#: ../../include/conversation.php:1237 ../../mod/editblock.php:150
#: ../../mod/editlayout.php:148 ../../mod/editpost.php:129
#: ../../mod/editwebpage.php:190 ../../mod/photos.php:1026
msgid "Please wait"
@@ -398,50 +296,50 @@ msgstr "Reactie"
#: ../../mod/admin.php:453 ../../mod/admin.php:596 ../../mod/admin.php:888
#: ../../mod/admin.php:1052 ../../mod/admin.php:1228 ../../mod/admin.php:1423
#: ../../mod/admin.php:1508 ../../mod/appman.php:99 ../../mod/chat.php:184
-#: ../../mod/chat.php:213 ../../mod/connect.php:93 ../../mod/events.php:461
-#: ../../mod/events.php:658 ../../mod/filestorage.php:156
-#: ../../mod/fsuggest.php:108 ../../mod/group.php:81 ../../mod/import.php:527
-#: ../../mod/import_items.php:122 ../../mod/invite.php:142
+#: ../../mod/chat.php:213 ../../mod/connect.php:93 ../../mod/connedit.php:720
+#: ../../mod/events.php:461 ../../mod/events.php:658
+#: ../../mod/filestorage.php:156 ../../mod/fsuggest.php:108
+#: ../../mod/group.php:81 ../../mod/import.php:527
+#: ../../mod/import_items.php:116 ../../mod/invite.php:142
#: ../../mod/locs.php:116 ../../mod/mail.php:380 ../../mod/mitem.php:231
-#: ../../mod/mood.php:135 ../../mod/pconfig.php:108 ../../mod/pdledit.php:58
+#: ../../mod/mood.php:135 ../../mod/pconfig.php:108 ../../mod/pdledit.php:59
#: ../../mod/photos.php:637 ../../mod/photos.php:1005
#: ../../mod/photos.php:1045 ../../mod/photos.php:1163 ../../mod/poke.php:171
#: ../../mod/profiles.php:675 ../../mod/rate.php:168
#: ../../mod/settings.php:586 ../../mod/settings.php:698
#: ../../mod/settings.php:726 ../../mod/settings.php:749
#: ../../mod/settings.php:834 ../../mod/settings.php:1023
-#: ../../mod/setup.php:331 ../../mod/setup.php:371 ../../mod/connedit.php:724
-#: ../../mod/sources.php:104 ../../mod/sources.php:138 ../../mod/thing.php:313
-#: ../../mod/thing.php:359 ../../mod/xchan.php:11
-#: ../../view/theme/redbasic/php/config.php:99
+#: ../../mod/setup.php:331 ../../mod/setup.php:371 ../../mod/sources.php:104
+#: ../../mod/sources.php:138 ../../mod/thing.php:313 ../../mod/thing.php:359
+#: ../../mod/xchan.php:11 ../../view/theme/redbasic/php/config.php:99
msgid "Submit"
msgstr "Opslaan"
-#: ../../include/ItemObject.php:698 ../../include/conversation.php:1199
+#: ../../include/ItemObject.php:698 ../../include/conversation.php:1209
#: ../../mod/editblock.php:136 ../../mod/editlayout.php:135
#: ../../mod/editpost.php:113 ../../mod/editwebpage.php:177
msgid "Bold"
msgstr "Vet"
-#: ../../include/ItemObject.php:699 ../../include/conversation.php:1200
+#: ../../include/ItemObject.php:699 ../../include/conversation.php:1210
#: ../../mod/editblock.php:137 ../../mod/editlayout.php:136
#: ../../mod/editpost.php:114 ../../mod/editwebpage.php:178
msgid "Italic"
msgstr "Cursief"
-#: ../../include/ItemObject.php:700 ../../include/conversation.php:1201
+#: ../../include/ItemObject.php:700 ../../include/conversation.php:1211
#: ../../mod/editblock.php:138 ../../mod/editlayout.php:137
#: ../../mod/editpost.php:115 ../../mod/editwebpage.php:179
msgid "Underline"
msgstr "Onderstrepen"
-#: ../../include/ItemObject.php:701 ../../include/conversation.php:1202
+#: ../../include/ItemObject.php:701 ../../include/conversation.php:1212
#: ../../mod/editblock.php:139 ../../mod/editlayout.php:138
#: ../../mod/editpost.php:116 ../../mod/editwebpage.php:180
msgid "Quote"
msgstr "Citeren"
-#: ../../include/ItemObject.php:702 ../../include/conversation.php:1203
+#: ../../include/ItemObject.php:702 ../../include/conversation.php:1213
#: ../../mod/editblock.php:140 ../../mod/editlayout.php:139
#: ../../mod/editpost.php:117 ../../mod/editwebpage.php:181
msgid "Code"
@@ -459,7 +357,7 @@ msgstr "Link invoegen"
msgid "Video"
msgstr "Video"
-#: ../../include/ItemObject.php:706 ../../include/conversation.php:1169
+#: ../../include/ItemObject.php:706 ../../include/conversation.php:1179
#: ../../include/page_widgets.php:40 ../../mod/editblock.php:171
#: ../../mod/editpost.php:149 ../../mod/editwebpage.php:212
#: ../../mod/events.php:458 ../../mod/photos.php:1046
@@ -467,7 +365,7 @@ msgstr "Video"
msgid "Preview"
msgstr "Voorvertoning"
-#: ../../include/ItemObject.php:709 ../../include/conversation.php:1257
+#: ../../include/ItemObject.php:709 ../../include/conversation.php:1267
#: ../../mod/editpost.php:157 ../../mod/mail.php:255 ../../mod/mail.php:385
msgid "Encrypt text"
msgstr "Tekst versleutelen"
@@ -502,14 +400,14 @@ msgid "Schedule Outbox"
msgstr "Planning-postvak UIT"
#: ../../include/RedDAV/RedBrowser.php:164 ../../include/apps.php:360
-#: ../../include/apps.php:415 ../../include/conversation.php:1027
-#: ../../include/widgets.php:1366 ../../mod/photos.php:754
+#: ../../include/apps.php:415 ../../include/conversation.php:1037
+#: ../../include/widgets.php:1368 ../../mod/photos.php:754
#: ../../mod/photos.php:1195
msgid "Unknown"
msgstr "Onbekend"
#: ../../include/RedDAV/RedBrowser.php:226 ../../include/apps.php:135
-#: ../../include/conversation.php:1629 ../../include/nav.php:93
+#: ../../include/conversation.php:1639 ../../include/nav.php:93
#: ../../mod/fbrowser.php:109
msgid "Files"
msgstr "Bestanden"
@@ -531,7 +429,7 @@ msgid "Create"
msgstr "Aanmaken"
#: ../../include/RedDAV/RedBrowser.php:231
-#: ../../include/RedDAV/RedBrowser.php:305 ../../include/widgets.php:1379
+#: ../../include/RedDAV/RedBrowser.php:305 ../../include/widgets.php:1381
#: ../../mod/photos.php:781 ../../mod/photos.php:1316
#: ../../mod/profile_photo.php:453 ../../mod/cover_photo.php:353
msgid "Upload"
@@ -617,7 +515,7 @@ msgid "Registration request at %s"
msgstr "Registratiebevestiging voor %s"
#: ../../include/account.php:317 ../../include/account.php:344
-#: ../../include/account.php:404 ../../include/network.php:1659
+#: ../../include/account.php:404 ../../include/network.php:1660
msgid "Administrator"
msgstr "Beheerder"
@@ -708,7 +606,7 @@ msgstr "Openbare tijdlijn"
msgid "Site Admin"
msgstr "Hubbeheerder"
-#: ../../include/apps.php:129 ../../include/conversation.php:1655
+#: ../../include/apps.php:129 ../../include/conversation.php:1665
#: ../../include/nav.php:103
msgid "Bookmarks"
msgstr "Bladwijzers"
@@ -717,6 +615,10 @@ msgstr "Bladwijzers"
msgid "Address Book"
msgstr "Connecties"
+#: ../../include/apps.php:131 ../../include/nav.php:111 ../../boot.php:1508
+msgid "Login"
+msgstr "Inloggen"
+
#: ../../include/apps.php:132 ../../include/nav.php:200
#: ../../mod/manage.php:160
msgid "Channel Manager"
@@ -732,7 +634,7 @@ msgstr "Grid"
msgid "Settings"
msgstr "Instellingen"
-#: ../../include/apps.php:136 ../../include/conversation.php:1665
+#: ../../include/apps.php:136 ../../include/conversation.php:1675
#: ../../include/nav.php:107 ../../mod/webpages.php:178
msgid "Webpages"
msgstr "Webpagina's"
@@ -741,12 +643,12 @@ msgstr "Webpagina's"
msgid "Channel Home"
msgstr "Jouw kanaal"
-#: ../../include/apps.php:138 ../../include/identity.php:1232
-#: ../../include/identity.php:1349 ../../mod/profperm.php:112
+#: ../../include/apps.php:138 ../../include/identity.php:1236
+#: ../../include/identity.php:1353 ../../mod/profperm.php:112
msgid "Profile"
msgstr "Profiel"
-#: ../../include/apps.php:139 ../../include/conversation.php:1622
+#: ../../include/apps.php:139 ../../include/conversation.php:1632
#: ../../include/nav.php:92 ../../mod/fbrowser.php:25
msgid "Photos"
msgstr "Foto's"
@@ -772,7 +674,7 @@ msgstr "Privéberichten"
msgid "Mood"
msgstr "Stemming"
-#: ../../include/apps.php:145 ../../include/conversation.php:956
+#: ../../include/apps.php:145 ../../include/conversation.php:965
msgid "Poke"
msgstr "Aanstoten"
@@ -782,7 +684,7 @@ msgstr "Chatten"
#: ../../include/apps.php:147 ../../include/nav.php:159
#: ../../include/text.php:885 ../../include/text.php:897
-#: ../../mod/connections.php:297 ../../mod/search.php:40
+#: ../../mod/connections.php:300 ../../mod/search.php:40
msgid "Search"
msgstr "Zoeken"
@@ -802,7 +704,7 @@ msgstr "Willekeurig kanaal"
msgid "Invite"
msgstr "Uitnodigen "
-#: ../../include/apps.php:152 ../../include/widgets.php:1252
+#: ../../include/apps.php:152 ../../include/widgets.php:1254
msgid "Features"
msgstr "Extra functies"
@@ -838,37 +740,37 @@ msgstr "Aanschaffen"
#: ../../include/attach.php:351 ../../include/attach.php:358
#: ../../include/attach.php:436 ../../include/attach.php:888
#: ../../include/attach.php:959 ../../include/attach.php:1111
-#: ../../include/chat.php:133 ../../include/items.php:4405
-#: ../../include/photos.php:29 ../../index.php:182 ../../index.php:367
+#: ../../include/chat.php:133 ../../include/photos.php:29
+#: ../../include/items.php:4407 ../../index.php:186 ../../index.php:371
#: ../../mod/achievements.php:30 ../../mod/api.php:26 ../../mod/api.php:31
#: ../../mod/appman.php:66 ../../mod/authtest.php:13 ../../mod/block.php:22
#: ../../mod/block.php:72 ../../mod/blocks.php:69 ../../mod/blocks.php:76
#: ../../mod/bookmarks.php:48 ../../mod/channel.php:100
#: ../../mod/channel.php:214 ../../mod/channel.php:254 ../../mod/chat.php:94
#: ../../mod/chat.php:99 ../../mod/common.php:35 ../../mod/connections.php:29
-#: ../../mod/editblock.php:65 ../../mod/editlayout.php:63
-#: ../../mod/editlayout.php:87 ../../mod/editpost.php:13
-#: ../../mod/editwebpage.php:64 ../../mod/editwebpage.php:86
-#: ../../mod/editwebpage.php:101 ../../mod/editwebpage.php:125
-#: ../../mod/events.php:260 ../../mod/filestorage.php:18
-#: ../../mod/filestorage.php:73 ../../mod/filestorage.php:88
-#: ../../mod/filestorage.php:115 ../../mod/fsuggest.php:78
-#: ../../mod/group.php:9 ../../mod/id.php:71 ../../mod/invite.php:13
-#: ../../mod/invite.php:87 ../../mod/item.php:206 ../../mod/item.php:214
-#: ../../mod/item.php:1049 ../../mod/layouts.php:69 ../../mod/layouts.php:76
-#: ../../mod/layouts.php:87 ../../mod/like.php:177 ../../mod/locs.php:83
-#: ../../mod/mail.php:126 ../../mod/manage.php:6 ../../mod/menu.php:74
-#: ../../mod/message.php:16 ../../mod/mitem.php:111 ../../mod/mood.php:112
-#: ../../mod/network.php:12 ../../mod/new_channel.php:68
-#: ../../mod/new_channel.php:99 ../../mod/notifications.php:66
-#: ../../mod/page.php:31 ../../mod/page.php:86 ../../mod/pdledit.php:21
-#: ../../mod/photos.php:70 ../../mod/poke.php:133 ../../mod/profile.php:64
-#: ../../mod/profile.php:72 ../../mod/profile_photo.php:341
-#: ../../mod/profile_photo.php:354 ../../mod/profiles.php:198
-#: ../../mod/profiles.php:584 ../../mod/rate.php:111 ../../mod/register.php:73
-#: ../../mod/regmod.php:17 ../../mod/service_limits.php:7
-#: ../../mod/settings.php:568 ../../mod/setup.php:227
-#: ../../mod/connedit.php:355 ../../mod/sharedwithme.php:7
+#: ../../mod/connedit.php:355 ../../mod/editblock.php:65
+#: ../../mod/editlayout.php:63 ../../mod/editlayout.php:87
+#: ../../mod/editpost.php:13 ../../mod/editwebpage.php:64
+#: ../../mod/editwebpage.php:86 ../../mod/editwebpage.php:101
+#: ../../mod/editwebpage.php:125 ../../mod/events.php:260
+#: ../../mod/filestorage.php:18 ../../mod/filestorage.php:73
+#: ../../mod/filestorage.php:88 ../../mod/filestorage.php:115
+#: ../../mod/fsuggest.php:78 ../../mod/group.php:9 ../../mod/id.php:71
+#: ../../mod/invite.php:13 ../../mod/invite.php:87 ../../mod/item.php:206
+#: ../../mod/item.php:214 ../../mod/item.php:1050 ../../mod/layouts.php:69
+#: ../../mod/layouts.php:76 ../../mod/layouts.php:87 ../../mod/like.php:177
+#: ../../mod/locs.php:83 ../../mod/mail.php:126 ../../mod/manage.php:6
+#: ../../mod/menu.php:74 ../../mod/message.php:16 ../../mod/mitem.php:111
+#: ../../mod/mood.php:112 ../../mod/network.php:12
+#: ../../mod/new_channel.php:68 ../../mod/new_channel.php:99
+#: ../../mod/notifications.php:66 ../../mod/page.php:31 ../../mod/page.php:86
+#: ../../mod/pdledit.php:22 ../../mod/photos.php:70 ../../mod/poke.php:133
+#: ../../mod/profile.php:64 ../../mod/profile.php:72
+#: ../../mod/profile_photo.php:341 ../../mod/profile_photo.php:354
+#: ../../mod/profiles.php:198 ../../mod/profiles.php:584
+#: ../../mod/rate.php:111 ../../mod/register.php:73 ../../mod/regmod.php:17
+#: ../../mod/service_limits.php:7 ../../mod/settings.php:568
+#: ../../mod/setup.php:227 ../../mod/sharedwithme.php:7
#: ../../mod/sources.php:66 ../../mod/suggest.php:26 ../../mod/thing.php:271
#: ../../mod/thing.php:291 ../../mod/thing.php:328
#: ../../mod/viewconnections.php:22 ../../mod/viewconnections.php:27
@@ -975,7 +877,7 @@ msgid "Finishes:"
msgstr "Einde:"
#: ../../include/bb2diaspora.php:487 ../../include/event.php:52
-#: ../../include/identity.php:998 ../../include/text.php:1425
+#: ../../include/identity.php:1000 ../../include/text.php:1425
#: ../../mod/directory.php:304
msgid "Location:"
msgstr "Plaats:"
@@ -1072,66 +974,6 @@ msgstr "Chatkanaal is vol"
msgid "Default"
msgstr "Standaard"
-#: ../../include/contact_selectors.php:56
-msgid "Frequently"
-msgstr "Regelmatig"
-
-#: ../../include/contact_selectors.php:57
-msgid "Hourly"
-msgstr "Elk uur"
-
-#: ../../include/contact_selectors.php:58
-msgid "Twice daily"
-msgstr "Twee keer per dag"
-
-#: ../../include/contact_selectors.php:59
-msgid "Daily"
-msgstr "Dagelijks"
-
-#: ../../include/contact_selectors.php:60
-msgid "Weekly"
-msgstr "Wekelijks"
-
-#: ../../include/contact_selectors.php:61
-msgid "Monthly"
-msgstr "Maandelijks"
-
-#: ../../include/contact_selectors.php:76
-msgid "Friendica"
-msgstr "Friendica"
-
-#: ../../include/contact_selectors.php:77
-msgid "OStatus"
-msgstr "OStatus"
-
-#: ../../include/contact_selectors.php:78
-msgid "RSS/Atom"
-msgstr "RSS/Atom"
-
-#: ../../include/contact_selectors.php:80
-msgid "Diaspora"
-msgstr "Diaspora"
-
-#: ../../include/contact_selectors.php:81
-msgid "Facebook"
-msgstr "Facebook"
-
-#: ../../include/contact_selectors.php:82
-msgid "Zot!"
-msgstr "Zot!"
-
-#: ../../include/contact_selectors.php:83
-msgid "LinkedIn"
-msgstr "LinkedIn"
-
-#: ../../include/contact_selectors.php:84
-msgid "XMPP/IM"
-msgstr "XMPP/IM"
-
-#: ../../include/contact_selectors.php:85
-msgid "MySpace"
-msgstr "MySpace"
-
#: ../../include/contact_widgets.php:14
#, php-format
msgid "%d invitation available"
@@ -1159,7 +1001,7 @@ msgstr "Verbinden/volgen"
msgid "Examples: Robert Morgenstein, Fishing"
msgstr "Voorbeeld: Robert Morgenstein, vissen"
-#: ../../include/contact_widgets.php:26 ../../mod/connections.php:300
+#: ../../include/contact_widgets.php:26 ../../mod/connections.php:303
#: ../../mod/directory.php:381 ../../mod/directory.php:386
msgid "Find"
msgstr "Vinden"
@@ -1181,7 +1023,7 @@ msgstr "Vrienden uitnodigen"
msgid "Advanced example: name=fred and country=iceland"
msgstr "Geavanceerd voorbeeld (Engels): name=jan en country=nederland"
-#: ../../include/contact_widgets.php:57 ../../include/features.php:92
+#: ../../include/contact_widgets.php:57 ../../include/features.php:93
#: ../../include/widgets.php:304
msgid "Saved Folders"
msgstr "Bewaarde mappen"
@@ -1331,389 +1173,385 @@ msgstr "Aan het laden..."
msgid "Delete Selected Items"
msgstr "Verwijder de geselecteerde items"
-#: ../../include/conversation.php:946
+#: ../../include/conversation.php:953
msgid "View Source"
msgstr "Bron weergeven"
-#: ../../include/conversation.php:947
+#: ../../include/conversation.php:954
msgid "Follow Thread"
msgstr "Conversatie volgen"
-#: ../../include/conversation.php:948
+#: ../../include/conversation.php:955
msgid "Unfollow Thread"
msgstr "Conversatie niet meer volgen"
-#: ../../include/conversation.php:949
-msgid "View Status"
-msgstr "Status weergeven"
-
-#: ../../include/conversation.php:950 ../../include/nav.php:86
+#: ../../include/conversation.php:959 ../../include/nav.php:86
#: ../../mod/connedit.php:507
msgid "View Profile"
msgstr "Profiel weergeven"
-#: ../../include/conversation.php:951
-msgid "View Photos"
-msgstr "Foto's weergeven"
-
-#: ../../include/conversation.php:952
+#: ../../include/conversation.php:960
msgid "Activity/Posts"
-msgstr "Kanaal-activiteit"
+msgstr "Activiteit/berichten connectie"
-#: ../../include/conversation.php:954
+#: ../../include/conversation.php:962
msgid "Edit Connection"
msgstr "Connectie bewerken"
-#: ../../include/conversation.php:955
-msgid "Send PM"
-msgstr "Privébericht verzenden"
+#: ../../include/conversation.php:963
+msgid "Message"
+msgstr "Bericht"
+
+#: ../../include/conversation.php:964 ../../mod/ratings.php:99
+msgid "Ratings"
+msgstr "Waarderingen"
-#: ../../include/conversation.php:1070
+#: ../../include/conversation.php:1080
#, php-format
msgid "%s likes this."
msgstr "%s vindt dit leuk."
-#: ../../include/conversation.php:1070
+#: ../../include/conversation.php:1080
#, php-format
msgid "%s doesn't like this."
msgstr "%s vindt dit niet leuk."
-#: ../../include/conversation.php:1074
+#: ../../include/conversation.php:1084
#, php-format
msgid "<span %1$s>%2$d people</span> like this."
msgid_plural "<span %1$s>%2$d people</span> like this."
msgstr[0] "<span %1$s>%2$d persoon</span> vindt dit leuk."
msgstr[1] "<span %1$s>%2$d personen</span> vinden dit leuk."
-#: ../../include/conversation.php:1076
+#: ../../include/conversation.php:1086
#, php-format
msgid "<span %1$s>%2$d people</span> don't like this."
msgid_plural "<span %1$s>%2$d people</span> don't like this."
msgstr[0] "<span %1$s>%2$d persoon</span> vindt dit niet leuk."
msgstr[1] "<span %1$s>%2$d personen</span> vinden dit niet leuk."
-#: ../../include/conversation.php:1082
+#: ../../include/conversation.php:1092
msgid "and"
msgstr "en"
-#: ../../include/conversation.php:1085
+#: ../../include/conversation.php:1095
#, 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/conversation.php:1086
+#: ../../include/conversation.php:1096
#, php-format
msgid "%s like this."
msgstr "%s vinden dit leuk."
-#: ../../include/conversation.php:1086
+#: ../../include/conversation.php:1096
#, php-format
msgid "%s don't like this."
msgstr "%s vinden dit niet leuk."
-#: ../../include/conversation.php:1154
+#: ../../include/conversation.php:1164
msgid "Visible to <strong>everybody</strong>"
msgstr "Voor <strong>iedereen</strong> zichtbaar"
-#: ../../include/conversation.php:1155 ../../mod/mail.php:202
+#: ../../include/conversation.php:1165 ../../mod/mail.php:202
#: ../../mod/mail.php:316
msgid "Please enter a link URL:"
msgstr "Vul een internetadres/URL in:"
-#: ../../include/conversation.php:1156
+#: ../../include/conversation.php:1166
msgid "Please enter a video link/URL:"
msgstr "Vul een videolink/URL in:"
-#: ../../include/conversation.php:1157
+#: ../../include/conversation.php:1167
msgid "Please enter an audio link/URL:"
msgstr "Vul een audiolink/URL in:"
-#: ../../include/conversation.php:1158
+#: ../../include/conversation.php:1168
msgid "Tag term:"
msgstr "Tag:"
-#: ../../include/conversation.php:1159 ../../mod/filer.php:48
+#: ../../include/conversation.php:1169 ../../mod/filer.php:48
msgid "Save to Folder:"
msgstr "Bewaar in map: "
-#: ../../include/conversation.php:1160
+#: ../../include/conversation.php:1170
msgid "Where are you right now?"
msgstr "Waar bevind je je op dit moment?"
-#: ../../include/conversation.php:1161 ../../mod/editpost.php:56
+#: ../../include/conversation.php:1171 ../../mod/editpost.php:56
#: ../../mod/mail.php:203 ../../mod/mail.php:317
msgid "Expires YYYY-MM-DD HH:MM"
msgstr "Verloopt op DD-MM-YYYY om HH:MM"
-#: ../../include/conversation.php:1192 ../../mod/blocks.php:154
+#: ../../include/conversation.php:1202 ../../mod/blocks.php:154
#: ../../mod/layouts.php:184 ../../mod/photos.php:1025
#: ../../mod/webpages.php:182
msgid "Share"
msgstr "Delen"
-#: ../../include/conversation.php:1194
+#: ../../include/conversation.php:1204
msgid "Page link name"
msgstr "Linknaam pagina"
-#: ../../include/conversation.php:1197
+#: ../../include/conversation.php:1207
msgid "Post as"
msgstr "Bericht plaatsen als"
-#: ../../include/conversation.php:1204 ../../mod/editblock.php:142
+#: ../../include/conversation.php:1214 ../../mod/editblock.php:142
#: ../../mod/editlayout.php:140 ../../mod/editpost.php:118
#: ../../mod/editwebpage.php:182
msgid "Upload photo"
msgstr "Foto uploaden"
-#: ../../include/conversation.php:1205
+#: ../../include/conversation.php:1215
msgid "upload photo"
msgstr "foto uploaden"
-#: ../../include/conversation.php:1206 ../../mod/editblock.php:143
+#: ../../include/conversation.php:1216 ../../mod/editblock.php:143
#: ../../mod/editlayout.php:141 ../../mod/editpost.php:119
#: ../../mod/editwebpage.php:183 ../../mod/mail.php:248 ../../mod/mail.php:378
msgid "Attach file"
msgstr "Bestand toevoegen"
-#: ../../include/conversation.php:1207
+#: ../../include/conversation.php:1217
msgid "attach file"
msgstr "bestand toevoegen"
-#: ../../include/conversation.php:1208 ../../mod/editblock.php:144
+#: ../../include/conversation.php:1218 ../../mod/editblock.php:144
#: ../../mod/editlayout.php:142 ../../mod/editpost.php:120
#: ../../mod/editwebpage.php:184 ../../mod/mail.php:249 ../../mod/mail.php:379
msgid "Insert web link"
msgstr "Weblink invoegen"
-#: ../../include/conversation.php:1209
+#: ../../include/conversation.php:1219
msgid "web link"
msgstr "Weblink"
-#: ../../include/conversation.php:1210
+#: ../../include/conversation.php:1220
msgid "Insert video link"
msgstr "Videolink invoegen"
-#: ../../include/conversation.php:1211
+#: ../../include/conversation.php:1221
msgid "video link"
msgstr "videolink"
-#: ../../include/conversation.php:1212
+#: ../../include/conversation.php:1222
msgid "Insert audio link"
msgstr "Audiolink invoegen"
-#: ../../include/conversation.php:1213
+#: ../../include/conversation.php:1223
msgid "audio link"
msgstr "audiolink"
-#: ../../include/conversation.php:1214 ../../mod/editblock.php:148
+#: ../../include/conversation.php:1224 ../../mod/editblock.php:148
#: ../../mod/editlayout.php:146 ../../mod/editpost.php:124
#: ../../mod/editwebpage.php:188
msgid "Set your location"
msgstr "Locatie instellen"
-#: ../../include/conversation.php:1215
+#: ../../include/conversation.php:1225
msgid "set location"
msgstr "locatie instellen"
-#: ../../include/conversation.php:1216 ../../mod/editpost.php:126
+#: ../../include/conversation.php:1226 ../../mod/editpost.php:126
msgid "Toggle voting"
msgstr "Peiling in- of uitschakelen"
-#: ../../include/conversation.php:1219 ../../mod/editblock.php:149
+#: ../../include/conversation.php:1229 ../../mod/editblock.php:149
#: ../../mod/editlayout.php:147 ../../mod/editpost.php:125
#: ../../mod/editwebpage.php:189
msgid "Clear browser location"
msgstr "Locatie van webbrowser wissen"
-#: ../../include/conversation.php:1220
+#: ../../include/conversation.php:1230
msgid "clear location"
msgstr "locatie wissen"
-#: ../../include/conversation.php:1222 ../../mod/editblock.php:162
+#: ../../include/conversation.php:1232 ../../mod/editblock.php:162
#: ../../mod/editpost.php:141 ../../mod/editwebpage.php:205
msgid "Title (optional)"
msgstr "Titel (optioneel)"
-#: ../../include/conversation.php:1226 ../../mod/editblock.php:165
+#: ../../include/conversation.php:1236 ../../mod/editblock.php:165
#: ../../mod/editlayout.php:163 ../../mod/editpost.php:143
#: ../../mod/editwebpage.php:207
msgid "Categories (optional, comma-separated list)"
msgstr "Categorieën (optioneel, door komma's gescheiden lijst)"
-#: ../../include/conversation.php:1228 ../../mod/editblock.php:151
+#: ../../include/conversation.php:1238 ../../mod/editblock.php:151
#: ../../mod/editlayout.php:149 ../../mod/editpost.php:130
#: ../../mod/editwebpage.php:191 ../../mod/events.php:459
msgid "Permission settings"
msgstr "Permissies"
-#: ../../include/conversation.php:1229
+#: ../../include/conversation.php:1239
msgid "permissions"
msgstr "permissies"
-#: ../../include/conversation.php:1237 ../../mod/editblock.php:159
+#: ../../include/conversation.php:1247 ../../mod/editblock.php:159
#: ../../mod/editlayout.php:156 ../../mod/editpost.php:138
#: ../../mod/editwebpage.php:200
msgid "Public post"
msgstr "Openbaar bericht"
-#: ../../include/conversation.php:1239 ../../mod/editblock.php:166
+#: ../../include/conversation.php:1249 ../../mod/editblock.php:166
#: ../../mod/editlayout.php:164 ../../mod/editpost.php:144
#: ../../mod/editwebpage.php:208
msgid "Example: bob@example.com, mary@example.com"
msgstr "Voorbeeld: bob@voorbeeld.nl, mary@voorbeeld.be"
-#: ../../include/conversation.php:1252 ../../mod/editblock.php:176
+#: ../../include/conversation.php:1262 ../../mod/editblock.php:176
#: ../../mod/editlayout.php:173 ../../mod/editpost.php:155
#: ../../mod/editwebpage.php:217 ../../mod/mail.php:253 ../../mod/mail.php:383
msgid "Set expiration date"
msgstr "Verloopdatum instellen"
-#: ../../include/conversation.php:1255
+#: ../../include/conversation.php:1265
msgid "Set publish date"
msgstr "Publicatiedatum instellen"
-#: ../../include/conversation.php:1259 ../../mod/editpost.php:159
+#: ../../include/conversation.php:1269 ../../mod/editpost.php:159
msgid "OK"
msgstr "OK"
-#: ../../include/conversation.php:1260 ../../mod/editpost.php:160
+#: ../../include/conversation.php:1270 ../../mod/editpost.php:160
#: ../../mod/fbrowser.php:77 ../../mod/fbrowser.php:112
#: ../../mod/settings.php:587 ../../mod/settings.php:613
#: ../../mod/tagrm.php:11 ../../mod/tagrm.php:134
msgid "Cancel"
msgstr "Annuleren"
-#: ../../include/conversation.php:1503
+#: ../../include/conversation.php:1513
msgid "Discover"
msgstr "Ontdekken"
-#: ../../include/conversation.php:1506
+#: ../../include/conversation.php:1516
msgid "Imported public streams"
msgstr "Openbare streams importeren"
-#: ../../include/conversation.php:1511
+#: ../../include/conversation.php:1521
msgid "Commented Order"
msgstr "Nieuwe reacties bovenaan"
-#: ../../include/conversation.php:1514
+#: ../../include/conversation.php:1524
msgid "Sort by Comment Date"
msgstr "Berichten met nieuwe reacties bovenaan"
-#: ../../include/conversation.php:1518
+#: ../../include/conversation.php:1528
msgid "Posted Order"
msgstr "Nieuwe berichten bovenaan"
-#: ../../include/conversation.php:1521
+#: ../../include/conversation.php:1531
msgid "Sort by Post Date"
msgstr "Nieuwe berichten bovenaan"
-#: ../../include/conversation.php:1526 ../../include/widgets.php:95
+#: ../../include/conversation.php:1536 ../../include/widgets.php:95
msgid "Personal"
msgstr "Persoonlijk"
-#: ../../include/conversation.php:1529
+#: ../../include/conversation.php:1539
msgid "Posts that mention or involve you"
msgstr "Alleen berichten die jou vermelden of waar je op een andere manier bij betrokken bent"
-#: ../../include/conversation.php:1535 ../../mod/connections.php:72
+#: ../../include/conversation.php:1545 ../../mod/connections.php:72
#: ../../mod/connections.php:82 ../../mod/menu.php:112
msgid "New"
msgstr "Nieuw"
-#: ../../include/conversation.php:1538
+#: ../../include/conversation.php:1548
msgid "Activity Stream - by date"
msgstr "Activiteitenstroom - volgens datum"
-#: ../../include/conversation.php:1544
+#: ../../include/conversation.php:1554
msgid "Starred"
msgstr "Met ster"
-#: ../../include/conversation.php:1547
+#: ../../include/conversation.php:1557
msgid "Favourite Posts"
msgstr "Favoriete berichten"
-#: ../../include/conversation.php:1554
+#: ../../include/conversation.php:1564
msgid "Spam"
msgstr "Spam"
-#: ../../include/conversation.php:1557
+#: ../../include/conversation.php:1567
msgid "Posts flagged as SPAM"
msgstr "Berichten gemarkeerd als SPAM"
-#: ../../include/conversation.php:1601 ../../mod/admin.php:1059
+#: ../../include/conversation.php:1611 ../../mod/admin.php:1059
msgid "Channel"
msgstr "Kanaal"
-#: ../../include/conversation.php:1604
+#: ../../include/conversation.php:1614
msgid "Status Messages and Posts"
msgstr "Berichten in dit kanaal"
-#: ../../include/conversation.php:1613
+#: ../../include/conversation.php:1623
msgid "About"
msgstr "Over"
-#: ../../include/conversation.php:1616
+#: ../../include/conversation.php:1626
msgid "Profile Details"
msgstr "Profiel"
-#: ../../include/conversation.php:1625 ../../include/photos.php:506
+#: ../../include/conversation.php:1635 ../../include/photos.php:506
msgid "Photo Albums"
msgstr "Fotoalbums"
-#: ../../include/conversation.php:1632
+#: ../../include/conversation.php:1642
msgid "Files and Storage"
msgstr "Bestanden en opslagruimte"
-#: ../../include/conversation.php:1642 ../../include/conversation.php:1645
+#: ../../include/conversation.php:1652 ../../include/conversation.php:1655
msgid "Chatrooms"
msgstr "Chatkanalen"
-#: ../../include/conversation.php:1658
+#: ../../include/conversation.php:1668
msgid "Saved Bookmarks"
msgstr "Opgeslagen bladwijzers"
-#: ../../include/conversation.php:1668
+#: ../../include/conversation.php:1678
msgid "Manage Webpages"
msgstr "Webpagina's beheren"
-#: ../../include/conversation.php:1727
+#: ../../include/conversation.php:1737
msgctxt "noun"
msgid "Attending"
msgid_plural "Attending"
msgstr[0] "aanwezig"
msgstr[1] "aanwezig"
-#: ../../include/conversation.php:1730
+#: ../../include/conversation.php:1740
msgctxt "noun"
msgid "Not Attending"
msgid_plural "Not Attending"
msgstr[0] "niet aanwezig"
msgstr[1] "niet aanwezig"
-#: ../../include/conversation.php:1733
+#: ../../include/conversation.php:1743
msgctxt "noun"
msgid "Undecided"
msgid_plural "Undecided"
msgstr[0] "nog niet beslist"
msgstr[1] "nog niet beslist"
-#: ../../include/conversation.php:1736
+#: ../../include/conversation.php:1746
msgctxt "noun"
msgid "Agree"
msgid_plural "Agrees"
msgstr[0] "eens"
msgstr[1] "eens"
-#: ../../include/conversation.php:1739
+#: ../../include/conversation.php:1749
msgctxt "noun"
msgid "Disagree"
msgid_plural "Disagrees"
msgstr[0] "oneens"
msgstr[1] "oneens"
-#: ../../include/conversation.php:1742
+#: ../../include/conversation.php:1752
msgctxt "noun"
msgid "Abstain"
msgid_plural "Abstains"
@@ -1733,6 +1571,10 @@ msgstr "JJJJ-MM-DD of MM-DD"
msgid "Required"
msgstr "Vereist"
+#: ../../include/datetime.php:263 ../../boot.php:2330
+msgid "never"
+msgstr "nooit"
+
#: ../../include/datetime.php:269
msgid "less than a second ago"
msgstr "minder dan een seconde geleden"
@@ -1822,6 +1664,31 @@ msgstr "Opties kanalengids"
msgid "Safe Mode"
msgstr "Veilig zoeken"
+#: ../../include/dir_fns.php:141 ../../include/dir_fns.php:142
+#: ../../include/dir_fns.php:143 ../../mod/admin.php:421 ../../mod/api.php:102
+#: ../../mod/connedit.php:644 ../../mod/connedit.php:693
+#: ../../mod/events.php:447 ../../mod/events.php:448 ../../mod/events.php:457
+#: ../../mod/filestorage.php:151 ../../mod/filestorage.php:159
+#: ../../mod/menu.php:96 ../../mod/menu.php:153 ../../mod/mitem.php:154
+#: ../../mod/mitem.php:155 ../../mod/mitem.php:228 ../../mod/mitem.php:229
+#: ../../mod/photos.php:626 ../../mod/removeme.php:60
+#: ../../mod/settings.php:577 ../../view/theme/redbasic/php/config.php:104
+#: ../../view/theme/redbasic/php/config.php:129 ../../boot.php:1512
+msgid "No"
+msgstr "Nee"
+
+#: ../../include/dir_fns.php:141 ../../include/dir_fns.php:142
+#: ../../include/dir_fns.php:143 ../../mod/admin.php:423 ../../mod/api.php:101
+#: ../../mod/events.php:447 ../../mod/events.php:448 ../../mod/events.php:457
+#: ../../mod/filestorage.php:151 ../../mod/filestorage.php:159
+#: ../../mod/menu.php:96 ../../mod/menu.php:153 ../../mod/mitem.php:154
+#: ../../mod/mitem.php:155 ../../mod/mitem.php:228 ../../mod/mitem.php:229
+#: ../../mod/photos.php:626 ../../mod/removeme.php:60
+#: ../../mod/settings.php:577 ../../view/theme/redbasic/php/config.php:104
+#: ../../view/theme/redbasic/php/config.php:129 ../../boot.php:1512
+msgid "Yes"
+msgstr "Ja"
+
#: ../../include/dir_fns.php:142
msgid "Public Forums Only"
msgstr "Alleen openbare forums"
@@ -2050,274 +1917,6 @@ msgstr "In behandeling"
msgid "Cancelled"
msgstr "Geannuleerd"
-#: ../../include/features.php:45
-msgid "General Features"
-msgstr "Algemene functies"
-
-#: ../../include/features.php:47
-msgid "Content Expiration"
-msgstr "Inhoud laten verlopen"
-
-#: ../../include/features.php:47
-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:48
-msgid "Multiple Profiles"
-msgstr "Meerdere profielen"
-
-#: ../../include/features.php:48
-msgid "Ability to create multiple profiles"
-msgstr "Mogelijkheid om meerdere profielen aan te maken"
-
-#: ../../include/features.php:49
-msgid "Advanced Profiles"
-msgstr "Geavanceerde profielen"
-
-#: ../../include/features.php:49
-msgid "Additional profile sections and selections"
-msgstr "Extra onderdelen en keuzes voor je profiel"
-
-#: ../../include/features.php:50
-msgid "Profile Import/Export"
-msgstr "Profiel importen/exporteren"
-
-#: ../../include/features.php:50
-msgid "Save and load profile details across sites/channels"
-msgstr "Profielgegevens opslaan en in andere hubs/kanalen gebruiken."
-
-#: ../../include/features.php:51
-msgid "Web Pages"
-msgstr "Webpagina's"
-
-#: ../../include/features.php:51
-msgid "Provide managed web pages on your channel"
-msgstr "Sta beheerde webpagina's op jouw kanaal toe"
-
-#: ../../include/features.php:52
-msgid "Private Notes"
-msgstr "Privé-aantekeningen"
-
-#: ../../include/features.php:52
-msgid "Enables a tool to store notes and reminders"
-msgstr "Schakelt een eenvoudige toepassing in om aantekeningen en herinneringen in op te slaan"
-
-#: ../../include/features.php:53
-msgid "Navigation Channel Select"
-msgstr "Kanaal kiezen in navigatiemenu"
-
-#: ../../include/features.php:53
-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:54
-msgid "Photo Location"
-msgstr "Fotolocatie"
-
-#: ../../include/features.php:54
-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:56
-msgid "Expert Mode"
-msgstr "Expertmodus"
-
-#: ../../include/features.php:56
-msgid "Enable Expert Mode to provide advanced configuration options"
-msgstr "Schakel de expertmodus in voor geavanceerde instellingen"
-
-#: ../../include/features.php:57
-msgid "Premium Channel"
-msgstr "Premiumkanaal"
-
-#: ../../include/features.php:57
-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:62
-msgid "Post Composition Features"
-msgstr "Functies voor het opstellen van berichten"
-
-#: ../../include/features.php:64
-msgid "Use Markdown"
-msgstr "Markdown gebruiken"
-
-#: ../../include/features.php:64
-msgid "Allow use of \"Markdown\" to format posts"
-msgstr "Sta het gebruik van \"markdown\" toe om berichten mee op te maken."
-
-#: ../../include/features.php:65
-msgid "Large Photos"
-msgstr "Grote foto's"
-
-#: ../../include/features.php:65
-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:66 ../../include/widgets.php:549
-#: ../../mod/sources.php:88
-msgid "Channel Sources"
-msgstr "Kanaalbronnen"
-
-#: ../../include/features.php:66
-msgid "Automatically import channel content from other channels or feeds"
-msgstr "Automatisch inhoud uit andere kanalen of feeds importeren."
-
-#: ../../include/features.php:67
-msgid "Even More Encryption"
-msgstr "Extra encryptie"
-
-#: ../../include/features.php:67
-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:68
-msgid "Enable Voting Tools"
-msgstr "Peilingen inschakelen"
-
-#: ../../include/features.php:68
-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:69
-msgid "Delayed Posting"
-msgstr "Berichten uitstellen"
-
-#: ../../include/features.php:69
-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:70
-msgid "Suppress Duplicate Posts/Comments"
-msgstr "Dubbele berichten/reacties tegenhouden"
-
-#: ../../include/features.php:70
-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:76
-msgid "Network and Stream Filtering"
-msgstr "Netwerk- en streamfilter"
-
-#: ../../include/features.php:77
-msgid "Search by Date"
-msgstr "Zoek op datum"
-
-#: ../../include/features.php:77
-msgid "Ability to select posts by date ranges"
-msgstr "Mogelijkheid om berichten op datum te filteren "
-
-#: ../../include/features.php:78
-msgid "Collections Filter"
-msgstr "Filter op collecties"
-
-#: ../../include/features.php:78
-msgid "Enable widget to display Network posts only from selected collections"
-msgstr "Sta de widget toe om netwerkberichten te tonen van bepaalde collecties"
-
-#: ../../include/features.php:79 ../../include/widgets.php:274
-msgid "Saved Searches"
-msgstr "Opgeslagen zoekopdrachten"
-
-#: ../../include/features.php:79
-msgid "Save search terms for re-use"
-msgstr "Sla zoekopdrachten op voor hergebruik"
-
-#: ../../include/features.php:80
-msgid "Network Personal Tab"
-msgstr "Persoonlijke netwerktab"
-
-#: ../../include/features.php:80
-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"
-
-#: ../../include/features.php:81
-msgid "Network New Tab"
-msgstr "Nieuwe netwerktab"
-
-#: ../../include/features.php:81
-msgid "Enable tab to display all new Network activity"
-msgstr "Laat de tab alle nieuwe netwerkactiviteit tonen"
-
-#: ../../include/features.php:82
-msgid "Affinity Tool"
-msgstr "Verwantschapsfilter"
-
-#: ../../include/features.php:82
-msgid "Filter stream activity by depth of relationships"
-msgstr "Filter wat je in jouw grid ziet op hoe goed je iemand kent of mag"
-
-#: ../../include/features.php:83
-msgid "Connection Filtering"
-msgstr "Berichtenfilters"
-
-#: ../../include/features.php:83
-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:84
-msgid "Suggest Channels"
-msgstr "Kanalen voorstellen"
-
-#: ../../include/features.php:84
-msgid "Show channel suggestions"
-msgstr "Voor jou mogelijk interessante kanalen voorstellen"
-
-#: ../../include/features.php:89
-msgid "Post/Comment Tools"
-msgstr "Bericht- en reactiehulpmiddelen"
-
-#: ../../include/features.php:90
-msgid "Community Tagging"
-msgstr "Taggen door anderen"
-
-#: ../../include/features.php:90
-msgid "Ability to tag existing posts"
-msgstr "Geeft andere mensen de mogelijkheid om jouw (bestaande) berichten te taggen"
-
-#: ../../include/features.php:91
-msgid "Post Categories"
-msgstr "Categorieën berichten"
-
-#: ../../include/features.php:91
-msgid "Add categories to your posts"
-msgstr "Voeg categorieën toe aan je berichten"
-
-#: ../../include/features.php:92
-msgid "Ability to file posts under folders"
-msgstr "Mogelijkheid om berichten in mappen op te slaan"
-
-#: ../../include/features.php:93
-msgid "Dislike Posts"
-msgstr "Vind berichten niet leuk"
-
-#: ../../include/features.php:93
-msgid "Ability to dislike posts/comments"
-msgstr "Mogelijkheid om berichten en reacties niet leuk te vinden"
-
-#: ../../include/features.php:94
-msgid "Star Posts"
-msgstr "Geef berichten een ster"
-
-#: ../../include/features.php:94
-msgid "Ability to mark special posts with a star indicator"
-msgstr "Mogelijkheid om speciale berichten met een ster te markeren"
-
-#: ../../include/features.php:95
-msgid "Tag Cloud"
-msgstr "Tagwolk"
-
-#: ../../include/features.php:95
-msgid "Provide a personal tag cloud on your channel page"
-msgstr "Zorgt voor een persoonlijke wolk met tags op jouw kanaalpagina"
-
#: ../../include/follow.php:28
msgid "Channel is blocked on this site."
msgstr "Kanaal is op deze hub geblokkeerd."
@@ -2359,7 +1958,7 @@ msgstr "Een verwijderde collectie met deze naam is gereactiveerd. Bestaande item
#: ../../include/group.php:232
msgid "Add new connections to this collection (privacy group)"
-msgstr "Voeg nieuwe connecties aan deze collectie toe (privacy-groep)"
+msgstr "Voeg nieuwe connecties aan deze collectie toe (privacygroep)"
#: ../../include/group.php:251 ../../mod/admin.php:900
msgid "All Channels"
@@ -2389,257 +1988,6 @@ msgstr "Kanalen die zich in geen enkele collectie bevinden"
msgid "add"
msgstr "toevoegen"
-#: ../../include/identity.php:32
-msgid "Unable to obtain identity information from database"
-msgstr "Niet in staat om identiteitsinformatie uit de database te verkrijgen"
-
-#: ../../include/identity.php:66
-msgid "Empty name"
-msgstr "Ontbrekende naam"
-
-#: ../../include/identity.php:69
-msgid "Name too long"
-msgstr "Naam te lang"
-
-#: ../../include/identity.php:181
-msgid "No account identifier"
-msgstr "Geen account-identificator"
-
-#: ../../include/identity.php:193
-msgid "Nickname is required."
-msgstr "Bijnaam is verplicht"
-
-#: ../../include/identity.php:207
-msgid "Reserved nickname. Please choose another."
-msgstr "Deze naam is gereserveerd. Kies een andere."
-
-#: ../../include/identity.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/identity.php:288
-msgid "Unable to retrieve created identity"
-msgstr "Niet in staat om aangemaakte identiteit te vinden"
-
-#: ../../include/identity.php:346
-msgid "Default Profile"
-msgstr "Standaardprofiel"
-
-#: ../../include/identity.php:390 ../../include/identity.php:391
-#: ../../include/identity.php:398 ../../include/profile_selectors.php:80
-#: ../../include/widgets.php:430 ../../mod/settings.php:338
-#: ../../mod/settings.php:342 ../../mod/settings.php:343
-#: ../../mod/settings.php:346 ../../mod/settings.php:357
-#: ../../mod/connedit.php:582
-msgid "Friends"
-msgstr "Vrienden"
-
-#: ../../include/identity.php:770
-msgid "Requested channel is not available."
-msgstr "Opgevraagd kanaal is niet beschikbaar."
-
-#: ../../include/identity.php:816 ../../mod/achievements.php:11
-#: ../../mod/blocks.php:29 ../../mod/connect.php:13 ../../mod/editblock.php:29
-#: ../../mod/editlayout.php:27 ../../mod/editwebpage.php:28
-#: ../../mod/filestorage.php:54 ../../mod/hcard.php:8 ../../mod/layouts.php:29
-#: ../../mod/profile.php:16 ../../mod/webpages.php:29
-msgid "Requested profile is not available."
-msgstr "Opgevraagd profiel is niet beschikbaar"
-
-#: ../../include/identity.php:960 ../../mod/profiles.php:782
-msgid "Change profile photo"
-msgstr "Profielfoto veranderen"
-
-#: ../../include/identity.php:966
-msgid "Profiles"
-msgstr "Profielen"
-
-#: ../../include/identity.php:966
-msgid "Manage/edit profiles"
-msgstr "Profielen beheren/bewerken"
-
-#: ../../include/identity.php:967 ../../mod/profiles.php:783
-msgid "Create New Profile"
-msgstr "Nieuw profiel aanmaken"
-
-#: ../../include/identity.php:970 ../../include/nav.php:90
-msgid "Edit Profile"
-msgstr "Profiel bewerken"
-
-#: ../../include/identity.php:982 ../../mod/profiles.php:794
-msgid "Profile Image"
-msgstr "Profielfoto"
-
-#: ../../include/identity.php:985
-msgid "visible to everybody"
-msgstr "Voor iedereen zichtbaar"
-
-#: ../../include/identity.php:986 ../../mod/profiles.php:677
-#: ../../mod/profiles.php:798
-msgid "Edit visibility"
-msgstr "Zichtbaarheid bewerken"
-
-#: ../../include/identity.php:1002 ../../include/identity.php:1242
-msgid "Gender:"
-msgstr "Geslacht:"
-
-#: ../../include/identity.php:1003 ../../include/identity.php:1286
-msgid "Status:"
-msgstr "Status:"
-
-#: ../../include/identity.php:1004 ../../include/identity.php:1297
-msgid "Homepage:"
-msgstr "Homepagina:"
-
-#: ../../include/identity.php:1005
-msgid "Online Now"
-msgstr "Nu online"
-
-#: ../../include/identity.php:1089 ../../include/identity.php:1167
-#: ../../mod/ping.php:318
-msgid "g A l F d"
-msgstr "G:i, l d F"
-
-#: ../../include/identity.php:1090 ../../include/identity.php:1168
-msgid "F d"
-msgstr "d F"
-
-#: ../../include/identity.php:1135 ../../include/identity.php:1207
-#: ../../mod/ping.php:341
-msgid "[today]"
-msgstr "[vandaag]"
-
-#: ../../include/identity.php:1146
-msgid "Birthday Reminders"
-msgstr "Verjaardagsherinneringen"
-
-#: ../../include/identity.php:1147
-msgid "Birthdays this week:"
-msgstr "Verjaardagen deze week:"
-
-#: ../../include/identity.php:1200
-msgid "[No description]"
-msgstr "[Geen omschrijving]"
-
-#: ../../include/identity.php:1218
-msgid "Event Reminders"
-msgstr "Herinneringen"
-
-#: ../../include/identity.php:1219
-msgid "Events this week:"
-msgstr "Gebeurtenissen deze week:"
-
-#: ../../include/identity.php:1240 ../../mod/settings.php:1029
-msgid "Full Name:"
-msgstr "Volledige naam:"
-
-#: ../../include/identity.php:1247
-msgid "Like this channel"
-msgstr "Vind dit kanaal leuk"
-
-#: ../../include/identity.php:1271
-msgid "j F, Y"
-msgstr "F j Y"
-
-#: ../../include/identity.php:1272
-msgid "j F"
-msgstr "F j"
-
-#: ../../include/identity.php:1279
-msgid "Birthday:"
-msgstr "Geboortedatum:"
-
-#: ../../include/identity.php:1283 ../../mod/directory.php:299
-msgid "Age:"
-msgstr "Leeftijd:"
-
-#: ../../include/identity.php:1292
-#, php-format
-msgid "for %1$d %2$s"
-msgstr "voor %1$d %2$s"
-
-#: ../../include/identity.php:1295 ../../mod/profiles.php:699
-msgid "Sexual Preference:"
-msgstr "Seksuele voorkeur:"
-
-#: ../../include/identity.php:1299 ../../mod/directory.php:315
-#: ../../mod/profiles.php:701
-msgid "Hometown:"
-msgstr "Oorspronkelijk uit:"
-
-#: ../../include/identity.php:1301
-msgid "Tags:"
-msgstr "Tags:"
-
-#: ../../include/identity.php:1303 ../../mod/profiles.php:702
-msgid "Political Views:"
-msgstr "Politieke overtuigingen:"
-
-#: ../../include/identity.php:1305
-msgid "Religion:"
-msgstr "Religie:"
-
-#: ../../include/identity.php:1307 ../../mod/directory.php:317
-msgid "About:"
-msgstr "Over:"
-
-#: ../../include/identity.php:1309
-msgid "Hobbies/Interests:"
-msgstr "Hobby's/interesses:"
-
-#: ../../include/identity.php:1311 ../../mod/profiles.php:705
-msgid "Likes:"
-msgstr "Houdt van:"
-
-#: ../../include/identity.php:1313 ../../mod/profiles.php:706
-msgid "Dislikes:"
-msgstr "Houdt niet van:"
-
-#: ../../include/identity.php:1315
-msgid "Contact information and Social Networks:"
-msgstr "Contactinformatie en sociale netwerken:"
-
-#: ../../include/identity.php:1317
-msgid "My other channels:"
-msgstr "Mijn andere kanalen"
-
-#: ../../include/identity.php:1319
-msgid "Musical interests:"
-msgstr "Muzikale interesses:"
-
-#: ../../include/identity.php:1321
-msgid "Books, literature:"
-msgstr "Boeken, literatuur:"
-
-#: ../../include/identity.php:1323
-msgid "Television:"
-msgstr "Televisie:"
-
-#: ../../include/identity.php:1325
-msgid "Film/dance/culture/entertainment:"
-msgstr "Films/dansen/cultuur/vermaak:"
-
-#: ../../include/identity.php:1327
-msgid "Love/Romance:"
-msgstr "Liefde/romantiek:"
-
-#: ../../include/identity.php:1329
-msgid "Work/employment:"
-msgstr "Werk/beroep:"
-
-#: ../../include/identity.php:1331
-msgid "School/education:"
-msgstr "School/opleiding:"
-
-#: ../../include/identity.php:1351
-msgid "Like this thing"
-msgstr "Vind dit ding leuk"
-
-#: ../../include/identity.php:1759 ../../mod/cover_photo.php:236
-msgid "cover photo"
-msgstr "omslagfoto"
-
#: ../../include/import.php:23
msgid ""
"Cannot create a duplicate channel identifier on this system. Import failed."
@@ -2653,79 +2001,6 @@ msgstr "Het klonen van het kanaal is mislukt. Importeren mislukt."
msgid "Cloned channel not found. Import failed."
msgstr "Gekloond kanaal niet gevonden. Importeren mislukt."
-#: ../../include/items.php:423 ../../index.php:366 ../../mod/dreport.php:6
-#: ../../mod/dreport.php:45 ../../mod/group.php:68
-#: ../../mod/import_items.php:114 ../../mod/like.php:280
-#: ../../mod/profperm.php:23 ../../mod/subthread.php:58
-msgid "Permission denied"
-msgstr "Toegang geweigerd"
-
-#: ../../include/items.php:1130 ../../include/items.php:1176
-msgid "(Unknown)"
-msgstr "(Onbekend)"
-
-#: ../../include/items.php:1373
-msgid "Visible to anybody on the internet."
-msgstr "Voor iedereen op het internet zichtbaar."
-
-#: ../../include/items.php:1375
-msgid "Visible to you only."
-msgstr "Alleen voor jou zichtbaar."
-
-#: ../../include/items.php:1377
-msgid "Visible to anybody in this network."
-msgstr "Voor iedereen in dit netwerk zichtbaar."
-
-#: ../../include/items.php:1379
-msgid "Visible to anybody authenticated."
-msgstr "Voor iedereen die geauthenticeerd is zichtbaar."
-
-#: ../../include/items.php:1381
-#, php-format
-msgid "Visible to anybody on %s."
-msgstr "Voor iedereen op %s zichtbaar."
-
-#: ../../include/items.php:1383
-msgid "Visible to all connections."
-msgstr "Voor alle connecties zichtbaar."
-
-#: ../../include/items.php:1385
-msgid "Visible to approved connections."
-msgstr "Voor alle goedgekeurde connecties zichtbaar."
-
-#: ../../include/items.php:1387
-msgid "Visible to specific connections."
-msgstr "Voor specifieke connecties zichtbaar."
-
-#: ../../include/items.php:4326 ../../mod/admin.php:135
-#: ../../mod/admin.php:1091 ../../mod/admin.php:1336 ../../mod/display.php:36
-#: ../../mod/filestorage.php:27 ../../mod/thing.php:86
-#: ../../mod/viewsrc.php:20
-msgid "Item not found."
-msgstr "Item niet gevonden."
-
-#: ../../include/items.php:4838 ../../mod/group.php:38 ../../mod/group.php:137
-msgid "Collection not found."
-msgstr "Collectie niet gevonden."
-
-#: ../../include/items.php:4854
-msgid "Collection is empty."
-msgstr "Collectie is leeg"
-
-#: ../../include/items.php:4861
-#, php-format
-msgid "Collection: %s"
-msgstr "Collectie: %s"
-
-#: ../../include/items.php:4871 ../../mod/connedit.php:692
-#, php-format
-msgid "Connection: %s"
-msgstr "Connectie: %s"
-
-#: ../../include/items.php:4873
-msgid "Connection not found."
-msgstr "Connectie niet gevonden."
-
#: ../../include/js_strings.php:5
msgid "Delete this item?"
msgstr "Dit item verwijderen?"
@@ -2778,8 +2053,8 @@ msgstr "Niets nieuw hier"
msgid "Rate This Channel (this is public)"
msgstr "Beoordeel dit kanaal (dit is openbaar)"
-#: ../../include/js_strings.php:20 ../../mod/rate.php:157
-#: ../../mod/connedit.php:703
+#: ../../include/js_strings.php:20 ../../mod/connedit.php:703
+#: ../../mod/rate.php:157
msgid "Rating"
msgstr "Beoordeling"
@@ -3068,6 +2343,10 @@ msgstr "Afzender kan niet bepaald worden."
msgid "Stored post could not be verified."
msgstr "Opgeslagen bericht kon niet worden geverifieerd."
+#: ../../include/nav.php:82 ../../include/nav.php:114 ../../boot.php:1507
+msgid "Logout"
+msgstr "Uitloggen"
+
#: ../../include/nav.php:82 ../../include/nav.php:114
msgid "End this session"
msgstr "Beëindig deze sessie"
@@ -3092,6 +2371,10 @@ msgstr "Bewerk profielen"
msgid "Manage/Edit profiles"
msgstr "Beheer/wijzig profielen"
+#: ../../include/nav.php:90 ../../include/identity.php:972
+msgid "Edit Profile"
+msgstr "Profiel bewerken"
+
#: ../../include/nav.php:90
msgid "Edit your profile"
msgstr "Jouw profiel bewerken"
@@ -3137,6 +2420,10 @@ msgstr "Authenticeer jezelf via (bijvoorbeeld) jouw hub"
msgid "Home Page"
msgstr "Homepage"
+#: ../../include/nav.php:149 ../../mod/register.php:264 ../../boot.php:1490
+msgid "Register"
+msgstr "Registreren"
+
#: ../../include/nav.php:149
msgid "Create an account"
msgstr "Maak een account aan"
@@ -3178,7 +2465,8 @@ msgstr "Jouw kanaal"
msgid "Mark all channel notifications seen"
msgstr "Alle kanaalnotificaties als gelezen markeren"
-#: ../../include/nav.php:181 ../../mod/connections.php:293
+#: ../../include/nav.php:181 ../../include/text.php:815
+#: ../../mod/connections.php:296
msgid "Connections"
msgstr "Connecties"
@@ -3242,7 +2530,7 @@ msgstr "Beheer je kanalen"
msgid "Account/Channel Settings"
msgstr "Account-/kanaal-instellingen"
-#: ../../include/nav.php:210 ../../include/widgets.php:1279
+#: ../../include/nav.php:210 ../../include/widgets.php:1281
msgid "Admin"
msgstr "Beheer"
@@ -3262,7 +2550,7 @@ msgstr "Wachten aub..."
msgid "view full size"
msgstr "volledige grootte tonen"
-#: ../../include/network.php:1673
+#: ../../include/network.php:1674
msgid "No Subject"
msgstr "Geen onderwerp"
@@ -3628,6 +2916,15 @@ msgstr "Ontrouw"
msgid "Sex Addict"
msgstr "Seksverslaafd"
+#: ../../include/profile_selectors.php:80 ../../include/identity.php:390
+#: ../../include/identity.php:391 ../../include/identity.php:398
+#: ../../include/widgets.php:430 ../../mod/connedit.php:582
+#: ../../mod/settings.php:338 ../../mod/settings.php:342
+#: ../../mod/settings.php:343 ../../mod/settings.php:346
+#: ../../mod/settings.php:357
+msgid "Friends"
+msgstr "Vrienden"
+
#: ../../include/profile_selectors.php:80
msgid "Friends/Benefits"
msgstr "Vriendschap plus"
@@ -3718,7 +3015,7 @@ msgstr "Maakt mij niks uit"
msgid "Ask me"
msgstr "Vraag het me"
-#: ../../include/security.php:381
+#: ../../include/security.php:384
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."
@@ -3756,6 +3053,605 @@ msgstr "vindt dit leuk"
msgid "dislikes"
msgstr "vindt dit niet leuk"
+#: ../../include/zot.php:676
+msgid "Invalid data packet"
+msgstr "Datapakket ongeldig"
+
+#: ../../include/zot.php:692
+msgid "Unable to verify channel signature"
+msgstr "Kanaalkenmerk kon niet worden geverifieerd. "
+
+#: ../../include/zot.php:2268
+#, php-format
+msgid "Unable to verify site signature for %s"
+msgstr "Hubkenmerk voor %s kon niet worden geverifieerd"
+
+#: ../../include/zot.php:3584
+msgid "invalid target signature"
+msgstr "ongeldig doelkenmerk"
+
+#: ../../include/contact_selectors.php:56
+msgid "Frequently"
+msgstr "Regelmatig"
+
+#: ../../include/contact_selectors.php:57
+msgid "Hourly"
+msgstr "Elk uur"
+
+#: ../../include/contact_selectors.php:58
+msgid "Twice daily"
+msgstr "Twee keer per dag"
+
+#: ../../include/contact_selectors.php:59
+msgid "Daily"
+msgstr "Dagelijks"
+
+#: ../../include/contact_selectors.php:60
+msgid "Weekly"
+msgstr "Wekelijks"
+
+#: ../../include/contact_selectors.php:61
+msgid "Monthly"
+msgstr "Maandelijks"
+
+#: ../../include/contact_selectors.php:76
+msgid "Friendica"
+msgstr "Friendica"
+
+#: ../../include/contact_selectors.php:77
+msgid "OStatus"
+msgstr "OStatus"
+
+#: ../../include/contact_selectors.php:78
+msgid "RSS/Atom"
+msgstr "RSS/Atom"
+
+#: ../../include/contact_selectors.php:79 ../../mod/admin.php:891
+#: ../../mod/admin.php:900 ../../mod/id.php:15 ../../mod/id.php:16
+#: ../../boot.php:1510
+msgid "Email"
+msgstr "E-mail"
+
+#: ../../include/contact_selectors.php:80
+msgid "Diaspora"
+msgstr "Diaspora"
+
+#: ../../include/contact_selectors.php:81
+msgid "Facebook"
+msgstr "Facebook"
+
+#: ../../include/contact_selectors.php:82
+msgid "Zot"
+msgstr "Zot"
+
+#: ../../include/contact_selectors.php:83
+msgid "LinkedIn"
+msgstr "LinkedIn"
+
+#: ../../include/contact_selectors.php:84
+msgid "XMPP/IM"
+msgstr "XMPP/IM"
+
+#: ../../include/contact_selectors.php:85
+msgid "MySpace"
+msgstr "MySpace"
+
+#: ../../include/features.php:45
+msgid "General Features"
+msgstr "Algemene functies"
+
+#: ../../include/features.php:47
+msgid "Content Expiration"
+msgstr "Inhoud laten verlopen"
+
+#: ../../include/features.php:47
+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:48
+msgid "Multiple Profiles"
+msgstr "Meerdere profielen"
+
+#: ../../include/features.php:48
+msgid "Ability to create multiple profiles"
+msgstr "Mogelijkheid om meerdere profielen aan te maken"
+
+#: ../../include/features.php:49
+msgid "Advanced Profiles"
+msgstr "Geavanceerde profielen"
+
+#: ../../include/features.php:49
+msgid "Additional profile sections and selections"
+msgstr "Extra onderdelen en keuzes voor je profiel"
+
+#: ../../include/features.php:50
+msgid "Profile Import/Export"
+msgstr "Profiel importen/exporteren"
+
+#: ../../include/features.php:50
+msgid "Save and load profile details across sites/channels"
+msgstr "Profielgegevens opslaan en in andere hubs/kanalen gebruiken."
+
+#: ../../include/features.php:51
+msgid "Web Pages"
+msgstr "Webpagina's"
+
+#: ../../include/features.php:51
+msgid "Provide managed web pages on your channel"
+msgstr "Sta beheerde webpagina's op jouw kanaal toe"
+
+#: ../../include/features.php:52
+msgid "Hide Rating"
+msgstr "Beoordelingen verbergen"
+
+#: ../../include/features.php:52
+msgid ""
+"Hide the rating buttons on your channel and profile pages. Note: People can "
+"still rate you somewhere else."
+msgstr "Verbergt de beoordelingsknoppen op jouw kanaal- en profielpagina's. Let op: Mensen kunnen jou nog steeds ergens anders beoordelen. "
+
+#: ../../include/features.php:53
+msgid "Private Notes"
+msgstr "Privé-aantekeningen"
+
+#: ../../include/features.php:53
+msgid "Enables a tool to store notes and reminders"
+msgstr "Schakelt een eenvoudige toepassing in om aantekeningen en herinneringen in op te slaan"
+
+#: ../../include/features.php:54
+msgid "Navigation Channel Select"
+msgstr "Kanaal kiezen in navigatiemenu"
+
+#: ../../include/features.php:54
+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:55
+msgid "Photo Location"
+msgstr "Fotolocatie"
+
+#: ../../include/features.php:55
+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:57
+msgid "Expert Mode"
+msgstr "Expertmodus"
+
+#: ../../include/features.php:57
+msgid "Enable Expert Mode to provide advanced configuration options"
+msgstr "Schakel de expertmodus in voor geavanceerde instellingen"
+
+#: ../../include/features.php:58
+msgid "Premium Channel"
+msgstr "Premiumkanaal"
+
+#: ../../include/features.php:58
+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:63
+msgid "Post Composition Features"
+msgstr "Functies voor het opstellen van berichten"
+
+#: ../../include/features.php:65
+msgid "Use Markdown"
+msgstr "Markdown gebruiken"
+
+#: ../../include/features.php:65
+msgid "Allow use of \"Markdown\" to format posts"
+msgstr "Sta het gebruik van \"markdown\" toe om berichten mee op te maken."
+
+#: ../../include/features.php:66
+msgid "Large Photos"
+msgstr "Grote foto's"
+
+#: ../../include/features.php:66
+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:67 ../../include/widgets.php:549
+#: ../../mod/sources.php:88
+msgid "Channel Sources"
+msgstr "Kanaalbronnen"
+
+#: ../../include/features.php:67
+msgid "Automatically import channel content from other channels or feeds"
+msgstr "Automatisch inhoud uit andere kanalen of feeds importeren."
+
+#: ../../include/features.php:68
+msgid "Even More Encryption"
+msgstr "Extra encryptie"
+
+#: ../../include/features.php:68
+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:69
+msgid "Enable Voting Tools"
+msgstr "Peilingen inschakelen"
+
+#: ../../include/features.php:69
+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:70
+msgid "Delayed Posting"
+msgstr "Berichten uitstellen"
+
+#: ../../include/features.php:70
+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:71
+msgid "Suppress Duplicate Posts/Comments"
+msgstr "Dubbele berichten/reacties tegenhouden"
+
+#: ../../include/features.php:71
+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:77
+msgid "Network and Stream Filtering"
+msgstr "Netwerk- en streamfilter"
+
+#: ../../include/features.php:78
+msgid "Search by Date"
+msgstr "Zoek op datum"
+
+#: ../../include/features.php:78
+msgid "Ability to select posts by date ranges"
+msgstr "Mogelijkheid om berichten op datum te filteren "
+
+#: ../../include/features.php:79
+msgid "Collections (Privacy Groups)"
+msgstr "Collecties (privacygroepen)"
+
+#: ../../include/features.php:79
+msgid "Enable widget to display Network posts only from selected collections"
+msgstr "Sta de widget toe om netwerkberichten te tonen van bepaalde collecties"
+
+#: ../../include/features.php:80 ../../include/widgets.php:274
+msgid "Saved Searches"
+msgstr "Opgeslagen zoekopdrachten"
+
+#: ../../include/features.php:80
+msgid "Save search terms for re-use"
+msgstr "Sla zoekopdrachten op voor hergebruik"
+
+#: ../../include/features.php:81
+msgid "Network Personal Tab"
+msgstr "Persoonlijke netwerktab"
+
+#: ../../include/features.php:81
+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"
+
+#: ../../include/features.php:82
+msgid "Network New Tab"
+msgstr "Nieuwe netwerktab"
+
+#: ../../include/features.php:82
+msgid "Enable tab to display all new Network activity"
+msgstr "Laat de tab alle nieuwe netwerkactiviteit tonen"
+
+#: ../../include/features.php:83
+msgid "Affinity Tool"
+msgstr "Verwantschapsfilter"
+
+#: ../../include/features.php:83
+msgid "Filter stream activity by depth of relationships"
+msgstr "Filter wat je in jouw grid ziet op hoe goed je iemand kent of mag"
+
+#: ../../include/features.php:84
+msgid "Connection Filtering"
+msgstr "Berichtenfilters"
+
+#: ../../include/features.php:84
+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:85
+msgid "Suggest Channels"
+msgstr "Kanalen voorstellen"
+
+#: ../../include/features.php:85
+msgid "Show channel suggestions"
+msgstr "Voor jou mogelijk interessante kanalen voorstellen"
+
+#: ../../include/features.php:90
+msgid "Post/Comment Tools"
+msgstr "Bericht- en reactiehulpmiddelen"
+
+#: ../../include/features.php:91
+msgid "Community Tagging"
+msgstr "Taggen door anderen"
+
+#: ../../include/features.php:91
+msgid "Ability to tag existing posts"
+msgstr "Geeft andere mensen de mogelijkheid om jouw (bestaande) berichten te taggen"
+
+#: ../../include/features.php:92
+msgid "Post Categories"
+msgstr "Categorieën berichten"
+
+#: ../../include/features.php:92
+msgid "Add categories to your posts"
+msgstr "Voeg categorieën toe aan je berichten"
+
+#: ../../include/features.php:93
+msgid "Ability to file posts under folders"
+msgstr "Mogelijkheid om berichten in mappen op te slaan"
+
+#: ../../include/features.php:94
+msgid "Dislike Posts"
+msgstr "Vind berichten niet leuk"
+
+#: ../../include/features.php:94
+msgid "Ability to dislike posts/comments"
+msgstr "Mogelijkheid om berichten en reacties niet leuk te vinden"
+
+#: ../../include/features.php:95
+msgid "Star Posts"
+msgstr "Geef berichten een ster"
+
+#: ../../include/features.php:95
+msgid "Ability to mark special posts with a star indicator"
+msgstr "Mogelijkheid om speciale berichten met een ster te markeren"
+
+#: ../../include/features.php:96
+msgid "Tag Cloud"
+msgstr "Tagwolk"
+
+#: ../../include/features.php:96
+msgid "Provide a personal tag cloud on your channel page"
+msgstr "Zorgt voor een persoonlijke wolk met tags op jouw kanaalpagina"
+
+#: ../../include/identity.php:32
+msgid "Unable to obtain identity information from database"
+msgstr "Niet in staat om identiteitsinformatie uit de database te verkrijgen"
+
+#: ../../include/identity.php:66
+msgid "Empty name"
+msgstr "Ontbrekende naam"
+
+#: ../../include/identity.php:69
+msgid "Name too long"
+msgstr "Naam te lang"
+
+#: ../../include/identity.php:181
+msgid "No account identifier"
+msgstr "Geen account-identificator"
+
+#: ../../include/identity.php:193
+msgid "Nickname is required."
+msgstr "Bijnaam is verplicht"
+
+#: ../../include/identity.php:207
+msgid "Reserved nickname. Please choose another."
+msgstr "Deze naam is gereserveerd. Kies een andere."
+
+#: ../../include/identity.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/identity.php:288
+msgid "Unable to retrieve created identity"
+msgstr "Niet in staat om aangemaakte identiteit te vinden"
+
+#: ../../include/identity.php:346
+msgid "Default Profile"
+msgstr "Standaardprofiel"
+
+#: ../../include/identity.php:772
+msgid "Requested channel is not available."
+msgstr "Opgevraagd kanaal is niet beschikbaar."
+
+#: ../../include/identity.php:818 ../../mod/achievements.php:11
+#: ../../mod/blocks.php:29 ../../mod/connect.php:13 ../../mod/editblock.php:29
+#: ../../mod/editlayout.php:27 ../../mod/editwebpage.php:28
+#: ../../mod/filestorage.php:54 ../../mod/hcard.php:8 ../../mod/layouts.php:29
+#: ../../mod/profile.php:16 ../../mod/webpages.php:29
+msgid "Requested profile is not available."
+msgstr "Opgevraagd profiel is niet beschikbaar"
+
+#: ../../include/identity.php:962 ../../mod/profiles.php:782
+msgid "Change profile photo"
+msgstr "Profielfoto veranderen"
+
+#: ../../include/identity.php:968
+msgid "Profiles"
+msgstr "Profielen"
+
+#: ../../include/identity.php:968
+msgid "Manage/edit profiles"
+msgstr "Profielen beheren/bewerken"
+
+#: ../../include/identity.php:969 ../../mod/profiles.php:783
+msgid "Create New Profile"
+msgstr "Nieuw profiel aanmaken"
+
+#: ../../include/identity.php:984 ../../mod/profiles.php:794
+msgid "Profile Image"
+msgstr "Profielfoto"
+
+#: ../../include/identity.php:987
+msgid "visible to everybody"
+msgstr "Voor iedereen zichtbaar"
+
+#: ../../include/identity.php:988 ../../mod/profiles.php:677
+#: ../../mod/profiles.php:798
+msgid "Edit visibility"
+msgstr "Zichtbaarheid bewerken"
+
+#: ../../include/identity.php:1004 ../../include/identity.php:1246
+msgid "Gender:"
+msgstr "Geslacht:"
+
+#: ../../include/identity.php:1005 ../../include/identity.php:1290
+msgid "Status:"
+msgstr "Status:"
+
+#: ../../include/identity.php:1006 ../../include/identity.php:1301
+msgid "Homepage:"
+msgstr "Homepagina:"
+
+#: ../../include/identity.php:1007
+msgid "Online Now"
+msgstr "Nu online"
+
+#: ../../include/identity.php:1093 ../../include/identity.php:1171
+#: ../../mod/ping.php:318
+msgid "g A l F d"
+msgstr "G:i, l d F"
+
+#: ../../include/identity.php:1094 ../../include/identity.php:1172
+msgid "F d"
+msgstr "d F"
+
+#: ../../include/identity.php:1139 ../../include/identity.php:1211
+#: ../../mod/ping.php:341
+msgid "[today]"
+msgstr "[vandaag]"
+
+#: ../../include/identity.php:1150
+msgid "Birthday Reminders"
+msgstr "Verjaardagsherinneringen"
+
+#: ../../include/identity.php:1151
+msgid "Birthdays this week:"
+msgstr "Verjaardagen deze week:"
+
+#: ../../include/identity.php:1204
+msgid "[No description]"
+msgstr "[Geen omschrijving]"
+
+#: ../../include/identity.php:1222
+msgid "Event Reminders"
+msgstr "Herinneringen"
+
+#: ../../include/identity.php:1223
+msgid "Events this week:"
+msgstr "Gebeurtenissen deze week:"
+
+#: ../../include/identity.php:1244 ../../mod/settings.php:1029
+msgid "Full Name:"
+msgstr "Volledige naam:"
+
+#: ../../include/identity.php:1251
+msgid "Like this channel"
+msgstr "Vind dit kanaal leuk"
+
+#: ../../include/identity.php:1275
+msgid "j F, Y"
+msgstr "F j Y"
+
+#: ../../include/identity.php:1276
+msgid "j F"
+msgstr "F j"
+
+#: ../../include/identity.php:1283
+msgid "Birthday:"
+msgstr "Geboortedatum:"
+
+#: ../../include/identity.php:1287 ../../mod/directory.php:299
+msgid "Age:"
+msgstr "Leeftijd:"
+
+#: ../../include/identity.php:1296
+#, php-format
+msgid "for %1$d %2$s"
+msgstr "voor %1$d %2$s"
+
+#: ../../include/identity.php:1299 ../../mod/profiles.php:699
+msgid "Sexual Preference:"
+msgstr "Seksuele voorkeur:"
+
+#: ../../include/identity.php:1303 ../../mod/directory.php:315
+#: ../../mod/profiles.php:701
+msgid "Hometown:"
+msgstr "Oorspronkelijk uit:"
+
+#: ../../include/identity.php:1305
+msgid "Tags:"
+msgstr "Tags:"
+
+#: ../../include/identity.php:1307 ../../mod/profiles.php:702
+msgid "Political Views:"
+msgstr "Politieke overtuigingen:"
+
+#: ../../include/identity.php:1309
+msgid "Religion:"
+msgstr "Religie:"
+
+#: ../../include/identity.php:1311 ../../mod/directory.php:317
+msgid "About:"
+msgstr "Over:"
+
+#: ../../include/identity.php:1313
+msgid "Hobbies/Interests:"
+msgstr "Hobby's/interesses:"
+
+#: ../../include/identity.php:1315 ../../mod/profiles.php:705
+msgid "Likes:"
+msgstr "Houdt van:"
+
+#: ../../include/identity.php:1317 ../../mod/profiles.php:706
+msgid "Dislikes:"
+msgstr "Houdt niet van:"
+
+#: ../../include/identity.php:1319
+msgid "Contact information and Social Networks:"
+msgstr "Contactinformatie en sociale netwerken:"
+
+#: ../../include/identity.php:1321
+msgid "My other channels:"
+msgstr "Mijn andere kanalen"
+
+#: ../../include/identity.php:1323
+msgid "Musical interests:"
+msgstr "Muzikale interesses:"
+
+#: ../../include/identity.php:1325
+msgid "Books, literature:"
+msgstr "Boeken, literatuur:"
+
+#: ../../include/identity.php:1327
+msgid "Television:"
+msgstr "Televisie:"
+
+#: ../../include/identity.php:1329
+msgid "Film/dance/culture/entertainment:"
+msgstr "Films/dansen/cultuur/vermaak:"
+
+#: ../../include/identity.php:1331
+msgid "Love/Romance:"
+msgstr "Liefde/romantiek:"
+
+#: ../../include/identity.php:1333
+msgid "Work/employment:"
+msgstr "Werk/beroep:"
+
+#: ../../include/identity.php:1335
+msgid "School/education:"
+msgstr "School/opleiding:"
+
+#: ../../include/identity.php:1355
+msgid "Like this thing"
+msgstr "Vind dit ding leuk"
+
+#: ../../include/identity.php:1763 ../../mod/cover_photo.php:236
+msgid "cover photo"
+msgstr "omslagfoto"
+
#: ../../include/text.php:394
msgid "prev"
msgstr "vorige"
@@ -3784,16 +3680,10 @@ msgstr "nieuwer"
msgid "No connections"
msgstr "Geen connecties"
-#: ../../include/text.php:815
+#: ../../include/text.php:828
#, php-format
-msgid "%d Connection"
-msgid_plural "%d Connections"
-msgstr[0] "%d connectie"
-msgstr[1] "%d connecties"
-
-#: ../../include/text.php:828 ../../mod/viewconnections.php:101
-msgid "View Connections"
-msgstr "Connecties weergeven"
+msgid "View all %s connections"
+msgstr "Toon alle %s connecties"
#: ../../include/text.php:886 ../../include/text.php:898
#: ../../include/widgets.php:192 ../../mod/admin.php:1568
@@ -4002,23 +3892,6 @@ msgstr "Lay-outs"
msgid "Pages"
msgstr "Pagina's"
-#: ../../include/zot.php:676
-msgid "Invalid data packet"
-msgstr "Datapakket ongeldig"
-
-#: ../../include/zot.php:692
-msgid "Unable to verify channel signature"
-msgstr "Kanaalkenmerk kon niet worden geverifieerd. "
-
-#: ../../include/zot.php:2268
-#, php-format
-msgid "Unable to verify site signature for %s"
-msgstr "Hubkenmerk voor %s kon niet worden geverifieerd"
-
-#: ../../include/zot.php:3584
-msgid "invalid target signature"
-msgstr "ongeldig doelkenmerk"
-
#: ../../include/widgets.php:93
msgid "System"
msgstr "Systeem"
@@ -4209,107 +4082,184 @@ msgstr "Voorgestelde chatkanalen"
msgid "photo/image"
msgstr "foto/afbeelding"
-#: ../../include/widgets.php:1116 ../../include/widgets.php:1118
+#: ../../include/widgets.php:1115
+msgid "Rating Tools"
+msgstr "Beoordelingen"
+
+#: ../../include/widgets.php:1119 ../../include/widgets.php:1121
msgid "Rate Me"
msgstr "Beoordeel mij"
-#: ../../include/widgets.php:1122
+#: ../../include/widgets.php:1124
msgid "View Ratings"
msgstr "Bekijk beoordelingen"
-#: ../../include/widgets.php:1133
+#: ../../include/widgets.php:1135
msgid "Public Hubs"
msgstr "Openbare hubs"
-#: ../../include/widgets.php:1181
+#: ../../include/widgets.php:1183
msgid "Forums"
msgstr "Forums"
-#: ../../include/widgets.php:1210
+#: ../../include/widgets.php:1212
msgid "Tasks"
msgstr "Taken"
-#: ../../include/widgets.php:1219
+#: ../../include/widgets.php:1221
msgid "Documentation"
msgstr "Documentatie"
-#: ../../include/widgets.php:1221
+#: ../../include/widgets.php:1223
msgid "Project/Site Information"
msgstr "Project- en hub-informatie"
-#: ../../include/widgets.php:1222
+#: ../../include/widgets.php:1224
msgid "For Members"
msgstr "Voor leden"
-#: ../../include/widgets.php:1223
+#: ../../include/widgets.php:1225
msgid "For Administrators"
msgstr "Voor beheerders"
-#: ../../include/widgets.php:1224
+#: ../../include/widgets.php:1226
msgid "For Developers"
msgstr "Voor ontwikkelaars"
-#: ../../include/widgets.php:1249 ../../mod/admin.php:452
+#: ../../include/widgets.php:1251 ../../mod/admin.php:452
msgid "Site"
msgstr "Hub-instellingen"
-#: ../../include/widgets.php:1250
+#: ../../include/widgets.php:1252
msgid "Accounts"
msgstr "Accounts"
-#: ../../include/widgets.php:1251 ../../mod/admin.php:1051
+#: ../../include/widgets.php:1253 ../../mod/admin.php:1051
msgid "Channels"
msgstr "Kanalen"
-#: ../../include/widgets.php:1253 ../../mod/admin.php:1166
+#: ../../include/widgets.php:1255 ../../mod/admin.php:1166
#: ../../mod/admin.php:1227
msgid "Plugins"
msgstr "Plug-ins"
-#: ../../include/widgets.php:1254 ../../mod/admin.php:1388
+#: ../../include/widgets.php:1256 ../../mod/admin.php:1388
#: ../../mod/admin.php:1422
msgid "Themes"
msgstr "Thema's"
-#: ../../include/widgets.php:1255
+#: ../../include/widgets.php:1257
msgid "Inspect queue"
msgstr "Inspecteer berichtenwachtrij"
-#: ../../include/widgets.php:1256
+#: ../../include/widgets.php:1258
msgid "Profile Config"
msgstr "Profielconfiguratie"
-#: ../../include/widgets.php:1257
+#: ../../include/widgets.php:1259
msgid "DB updates"
msgstr "Database-updates"
-#: ../../include/widgets.php:1275 ../../include/widgets.php:1281
+#: ../../include/widgets.php:1277 ../../include/widgets.php:1283
#: ../../mod/admin.php:1507
msgid "Logs"
msgstr "Logboeken"
-#: ../../include/widgets.php:1280
+#: ../../include/widgets.php:1282
msgid "Plugin Features"
msgstr "Plug-in-opties"
-#: ../../include/widgets.php:1282
+#: ../../include/widgets.php:1284
msgid "User registrations waiting for confirmation"
msgstr "Accounts die op goedkeuring wachten"
-#: ../../include/widgets.php:1360 ../../mod/photos.php:748
+#: ../../include/widgets.php:1362 ../../mod/photos.php:748
#: ../../mod/photos.php:1283
msgid "View Photo"
msgstr "Foto weergeven"
-#: ../../include/widgets.php:1377 ../../mod/photos.php:779
+#: ../../include/widgets.php:1379 ../../mod/photos.php:779
msgid "Edit Album"
msgstr "Album bewerken"
-#: ../../index.php:238 ../../mod/help.php:213
+#: ../../include/items.php:423 ../../index.php:370 ../../mod/dreport.php:6
+#: ../../mod/dreport.php:45 ../../mod/group.php:68
+#: ../../mod/import_items.php:108 ../../mod/like.php:280
+#: ../../mod/profperm.php:23 ../../mod/subthread.php:58
+msgid "Permission denied"
+msgstr "Toegang geweigerd"
+
+#: ../../include/items.php:1130 ../../include/items.php:1176
+msgid "(Unknown)"
+msgstr "(Onbekend)"
+
+#: ../../include/items.php:1373
+msgid "Visible to anybody on the internet."
+msgstr "Voor iedereen op het internet zichtbaar."
+
+#: ../../include/items.php:1375
+msgid "Visible to you only."
+msgstr "Alleen voor jou zichtbaar."
+
+#: ../../include/items.php:1377
+msgid "Visible to anybody in this network."
+msgstr "Voor iedereen in dit netwerk zichtbaar."
+
+#: ../../include/items.php:1379
+msgid "Visible to anybody authenticated."
+msgstr "Voor iedereen die geauthenticeerd is zichtbaar."
+
+#: ../../include/items.php:1381
+#, php-format
+msgid "Visible to anybody on %s."
+msgstr "Voor iedereen op %s zichtbaar."
+
+#: ../../include/items.php:1383
+msgid "Visible to all connections."
+msgstr "Voor alle connecties zichtbaar."
+
+#: ../../include/items.php:1385
+msgid "Visible to approved connections."
+msgstr "Voor alle geaccepteerde connecties zichtbaar."
+
+#: ../../include/items.php:1387
+msgid "Visible to specific connections."
+msgstr "Voor specifieke connecties zichtbaar."
+
+#: ../../include/items.php:4328 ../../mod/admin.php:135
+#: ../../mod/admin.php:1091 ../../mod/admin.php:1336 ../../mod/display.php:36
+#: ../../mod/filestorage.php:27 ../../mod/thing.php:86
+#: ../../mod/viewsrc.php:20
+msgid "Item not found."
+msgstr "Item niet gevonden."
+
+#: ../../include/items.php:4840 ../../mod/group.php:38 ../../mod/group.php:137
+msgid "Collection not found."
+msgstr "Collectie niet gevonden."
+
+#: ../../include/items.php:4856
+msgid "Collection is empty."
+msgstr "Collectie is leeg"
+
+#: ../../include/items.php:4863
+#, php-format
+msgid "Collection: %s"
+msgstr "Collectie: %s"
+
+#: ../../include/items.php:4873 ../../mod/connedit.php:692
+#, php-format
+msgid "Connection: %s"
+msgstr "Connectie: %s"
+
+#: ../../include/items.php:4875
+msgid "Connection not found."
+msgstr "Connectie niet gevonden."
+
+#: ../../index.php:242 ../../mod/help.php:213
msgid "Not Found"
msgstr "Niet gevonden"
-#: ../../index.php:241 ../../mod/block.php:75 ../../mod/display.php:110
+#: ../../index.php:245 ../../mod/block.php:75 ../../mod/display.php:110
#: ../../mod/help.php:216 ../../mod/page.php:89
msgid "Page not found."
msgstr "Pagina niet gevonden."
@@ -4701,7 +4651,7 @@ msgid ""
msgstr "Maximale systeembelasting voordat de afleverings- en polllingsprocessen worden uitgesteld. Standaard is 50."
#: ../../mod/admin.php:495
-msgid "Expiration period in days for imported (matrix/network) content"
+msgid "Expiration period in days for imported (grid/network) content"
msgstr "Aantal dagen waarna geïmporteerde inhoud uit iemands grid/netwerk-pagina wordt verwijderd."
#: ../../mod/admin.php:495
@@ -4741,7 +4691,7 @@ msgstr "voor kanaal"
msgid "on server"
msgstr "op hub"
-#: ../../mod/admin.php:618 ../../mod/connections.php:267
+#: ../../mod/admin.php:618 ../../mod/connections.php:266
msgid "Status"
msgstr "Status"
@@ -4870,7 +4820,7 @@ msgstr "Tijd/datum verzoek"
msgid "No registrations."
msgstr "Geen verzoeken."
-#: ../../mod/admin.php:893 ../../mod/connedit.php:719
+#: ../../mod/admin.php:893 ../../mod/connections.php:271
msgid "Approve"
msgstr "Goedkeuren"
@@ -5398,8 +5348,8 @@ msgid "Only show hidden connections"
msgstr "Toon alleen verborgen connecties"
#: ../../mod/connections.php:234
-msgid "Pending"
-msgstr "Nog niet goedgekeurd"
+msgid "Pending approval"
+msgstr "Moet nog geaccepteerd worden"
#: ../../mod/connections.php:250
#, php-format
@@ -5414,18 +5364,277 @@ msgstr "Connectie bewerken"
msgid "Delete connection"
msgstr "Connectie verwijderen"
-#: ../../mod/connections.php:269
+#: ../../mod/connections.php:261
+msgid "Channel address"
+msgstr "Kanaaladres"
+
+#: ../../mod/connections.php:263
+msgid "Network"
+msgstr "Netwerk"
+
+#: ../../mod/connections.php:268
msgid "Connected"
msgstr "Verbonden"
-#: ../../mod/connections.php:298
+#: ../../mod/connections.php:270
+msgid "Approve connection"
+msgstr "Connectie accepteren"
+
+#: ../../mod/connections.php:272
+msgid "Recent activity"
+msgstr "Recente activiteit"
+
+#: ../../mod/connections.php:301
msgid "Search your connections"
msgstr "Doorzoek jouw connecties"
-#: ../../mod/connections.php:299
+#: ../../mod/connections.php:302
msgid "Connections search"
msgstr "Connecties zoeken"
+#: ../../mod/connedit.php:75
+msgid "Could not access contact record."
+msgstr "Kon geen toegang krijgen tot de connectie-gegevens."
+
+#: ../../mod/connedit.php:99
+msgid "Could not locate selected profile."
+msgstr "Kon het gekozen profiel niet vinden."
+
+#: ../../mod/connedit.php:223
+msgid "Connection updated."
+msgstr "Connectie bijgewerkt."
+
+#: ../../mod/connedit.php:225
+msgid "Failed to update connection record."
+msgstr "Bijwerken van connectie-gegevens mislukt."
+
+#: ../../mod/connedit.php:272
+msgid "is now connected to"
+msgstr "is nu verbonden met"
+
+#: ../../mod/connedit.php:398
+msgid "Could not access address book record."
+msgstr "Kon geen toegang krijgen tot de record van de connectie."
+
+#: ../../mod/connedit.php:412
+msgid "Refresh failed - channel is currently unavailable."
+msgstr "Vernieuwen mislukt - kanaal is momenteel niet beschikbaar"
+
+#: ../../mod/connedit.php:427 ../../mod/connedit.php:436
+#: ../../mod/connedit.php:445 ../../mod/connedit.php:454
+#: ../../mod/connedit.php:467
+msgid "Unable to set address book parameters."
+msgstr "Niet in staat om de parameters van connecties in te stellen."
+
+#: ../../mod/connedit.php:491
+msgid "Connection has been removed."
+msgstr "Connectie is verwijderd"
+
+#: ../../mod/connedit.php:510
+#, php-format
+msgid "View %s's profile"
+msgstr "Profiel van %s weergeven"
+
+#: ../../mod/connedit.php:514
+msgid "Refresh Permissions"
+msgstr "Permissies vernieuwen"
+
+#: ../../mod/connedit.php:517
+msgid "Fetch updated permissions"
+msgstr "Aangepaste permissies ophalen"
+
+#: ../../mod/connedit.php:521
+msgid "Recent Activity"
+msgstr "Recente activiteit/berichten"
+
+#: ../../mod/connedit.php:524
+msgid "View recent posts and comments"
+msgstr "Recente berichten en reacties weergeven"
+
+#: ../../mod/connedit.php:531
+msgid "Block (or Unblock) all communications with this connection"
+msgstr "Blokkeer (of deblokkeer) alle communicatie met deze connectie"
+
+#: ../../mod/connedit.php:532
+msgid "This connection is blocked!"
+msgstr "Deze connectie is geblokkeerd!"
+
+#: ../../mod/connedit.php:536
+msgid "Unignore"
+msgstr "Niet meer negeren"
+
+#: ../../mod/connedit.php:536 ../../mod/notifications.php:51
+msgid "Ignore"
+msgstr "Negeren"
+
+#: ../../mod/connedit.php:539
+msgid "Ignore (or Unignore) all inbound communications from this connection"
+msgstr "Negeer (of negeer niet meer) alle inkomende communicatie van deze connectie"
+
+#: ../../mod/connedit.php:540
+msgid "This connection is ignored!"
+msgstr "Deze connectie wordt genegeerd!"
+
+#: ../../mod/connedit.php:544
+msgid "Unarchive"
+msgstr "Niet meer archiveren"
+
+#: ../../mod/connedit.php:544
+msgid "Archive"
+msgstr "Archiveren"
+
+#: ../../mod/connedit.php:547
+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"
+
+#: ../../mod/connedit.php:548
+msgid "This connection is archived!"
+msgstr "Deze connectie is gearchiveerd!"
+
+#: ../../mod/connedit.php:552
+msgid "Unhide"
+msgstr "Niet meer verbergen"
+
+#: ../../mod/connedit.php:552
+msgid "Hide"
+msgstr "Verbergen"
+
+#: ../../mod/connedit.php:555
+msgid "Hide or Unhide this connection from your other connections"
+msgstr "Deze connectie verbergen (of niet meer verbergen) voor jouw andere connecties"
+
+#: ../../mod/connedit.php:556
+msgid "This connection is hidden!"
+msgstr "Deze connectie is verborgen!"
+
+#: ../../mod/connedit.php:563
+msgid "Delete this connection"
+msgstr "Deze connectie verwijderen"
+
+#: ../../mod/connedit.php:644
+msgid "Approve this connection"
+msgstr "Deze connectie accepteren"
+
+#: ../../mod/connedit.php:644
+msgid "Accept connection to allow communication"
+msgstr "Keur deze connectie goed om communicatie toe te staan"
+
+#: ../../mod/connedit.php:649
+msgid "Set Affinity"
+msgstr "Verwantschapsfilter instellen"
+
+#: ../../mod/connedit.php:652
+msgid "Set Profile"
+msgstr "Profiel instellen"
+
+#: ../../mod/connedit.php:655
+msgid "Set Affinity & Profile"
+msgstr "Verwantschapsfilter en profiel instellen"
+
+#: ../../mod/connedit.php:688
+msgid "none"
+msgstr "geen"
+
+#: ../../mod/connedit.php:693
+msgid "Apply these permissions automatically"
+msgstr "Deze permissies automatisch toepassen"
+
+#: ../../mod/connedit.php:695
+msgid "This connection's primary address is"
+msgstr "Het primaire kanaaladres van deze connectie is"
+
+#: ../../mod/connedit.php:696
+msgid "Available locations:"
+msgstr "Beschikbare locaties:"
+
+#: ../../mod/connedit.php:700
+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."
+
+#: ../../mod/connedit.php:702
+msgid "Slide to adjust your degree of friendship"
+msgstr "Schuif om te bepalen hoe goed je iemand kent en/of mag"
+
+#: ../../mod/connedit.php:704
+msgid "Slide to adjust your rating"
+msgstr "Gebruik de schuif om je beoordeling te geven"
+
+#: ../../mod/connedit.php:705 ../../mod/connedit.php:710
+msgid "Optionally explain your rating"
+msgstr "Verklaar jouw beoordeling (niet verplicht)"
+
+#: ../../mod/connedit.php:707
+msgid "Custom Filter"
+msgstr "Berichtenfilter"
+
+#: ../../mod/connedit.php:708
+msgid "Only import posts with this text"
+msgstr "Importeer alleen berichten met deze tekst"
+
+#: ../../mod/connedit.php:708 ../../mod/connedit.php:709
+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"
+
+#: ../../mod/connedit.php:709
+msgid "Do not import posts with this text"
+msgstr "Importeer geen berichten met deze tekst"
+
+#: ../../mod/connedit.php:711
+msgid "This information is public!"
+msgstr "Deze informatie is openbaar!"
+
+#: ../../mod/connedit.php:716
+msgid "Connection Pending Approval"
+msgstr "Connectie moet nog geaccepteerd worden"
+
+#: ../../mod/connedit.php:719
+msgid "inherited"
+msgstr "geërfd"
+
+#: ../../mod/connedit.php:721
+#, php-format
+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."
+
+#: ../../mod/connedit.php:723
+msgid "Their Settings"
+msgstr "Hun instellingen"
+
+#: ../../mod/connedit.php:724
+msgid "My Settings"
+msgstr "Mijn instellingen"
+
+#: ../../mod/connedit.php:726
+msgid "Individual Permissions"
+msgstr "Individuele permissies"
+
+#: ../../mod/connedit.php:727
+msgid ""
+"Some permissions may be inherited from your channel's <a "
+"href=\"settings\"><strong>privacy settings</strong></a>, which have higher "
+"priority than individual settings. You can <strong>not</strong> change those"
+" settings here."
+msgstr "Sommige permissies worden mogelijk overgeërfd van de <a href=\"settings\">privacy-instellingen</a> van jouw kanaal, die een hogere prioriteit hebben dan deze individuele instellingen. Je kan je deze overgeërfde permissies hier <strong>niet</strong> veranderen."
+
+#: ../../mod/connedit.php:728
+msgid ""
+"Some permissions may be inherited from your channel's <a "
+"href=\"settings\"><strong>privacy settings</strong></a>, which have higher "
+"priority than individual settings. You can change those settings here but "
+"they wont have any impact unless the inherited setting changes."
+msgstr "Sommige permissies worden mogelijk overgeërfd van de <a href=\"settings\">privacy-instellingen</a> 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. "
+
+#: ../../mod/connedit.php:729
+msgid "Last update:"
+msgstr "Laatste wijziging:"
+
#: ../../mod/dav.php:121
msgid "$Projectname channel"
msgstr "$Projectname-kanaal"
@@ -5922,7 +6131,7 @@ msgstr "Zoek documentatie"
msgid "Help:"
msgstr "Hulp:"
-#: ../../mod/help.php:237
+#: ../../mod/help.php:239
msgid "$Projectname Documentation"
msgstr "$Projectname-documentatie"
@@ -6054,7 +6263,7 @@ msgid ""
"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."
-#: ../../mod/import.php:516 ../../mod/import_items.php:121
+#: ../../mod/import.php:516 ../../mod/import_items.php:115
msgid "File to Upload"
msgstr "Bestand om te uploaden"
@@ -6098,15 +6307,15 @@ msgid ""
"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."
-#: ../../mod/import_items.php:101
+#: ../../mod/import_items.php:98
msgid "Import completed"
msgstr "Importeren voltooid"
-#: ../../mod/import_items.php:119
+#: ../../mod/import_items.php:113
msgid "Import Items"
msgstr "Importeer items"
-#: ../../mod/import_items.php:120
+#: ../../mod/import_items.php:114
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."
@@ -6193,24 +6402,24 @@ msgstr "Leeg bericht geannuleerd"
msgid "Executable content type not permitted to this channel."
msgstr "Uitvoerbare bestanden zijn niet toegestaan op dit kanaal."
-#: ../../mod/item.php:822
+#: ../../mod/item.php:824
msgid "Duplicate post suppressed."
msgstr "Dubbel bericht tegengehouden."
-#: ../../mod/item.php:953
+#: ../../mod/item.php:954
msgid "System error. Post not saved."
msgstr "Systeemfout. Bericht niet opgeslagen."
-#: ../../mod/item.php:1220
+#: ../../mod/item.php:1221
msgid "Unable to obtain post information from database."
msgstr "Niet in staat om informatie over dit bericht uit de database te verkrijgen."
-#: ../../mod/item.php:1227
+#: ../../mod/item.php:1228
#, php-format
msgid "You have reached your limit of %1$.0f top level posts."
msgstr "Je hebt jouw limiet van %1$.0f berichten bereikt."
-#: ../../mod/item.php:1234
+#: ../../mod/item.php:1235
#, php-format
msgid "You have reached your limit of %1$.0f webpages."
msgstr "Je hebt jouw limiet van %1$.0f webpagina's bereikt."
@@ -6359,75 +6568,6 @@ msgstr "Wij adviseren, wanneer dit (nog) mogelijk is, de locatie te verwijderen
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."
-#: ../../mod/lostpass.php:15
-msgid "No valid account found."
-msgstr "Geen geldige account gevonden."
-
-#: ../../mod/lostpass.php:29
-msgid "Password reset request issued. Check your email."
-msgstr "Het verzoek om je wachtwoord opnieuw in te stellen is behandeld. Controleer je e-mail."
-
-#: ../../mod/lostpass.php:35 ../../mod/lostpass.php:103
-#, php-format
-msgid "Site Member (%s)"
-msgstr "Lid van hub (%s)"
-
-#: ../../mod/lostpass.php:40
-#, php-format
-msgid "Password reset requested at %s"
-msgstr "Verzoek tot het opnieuw instellen van een wachtwoord op %s is ingediend"
-
-#: ../../mod/lostpass.php:63
-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."
-
-#: ../../mod/lostpass.php:87
-msgid "Your password has been reset as requested."
-msgstr "Jouw wachtwoord is opnieuw ingesteld zoals je had verzocht."
-
-#: ../../mod/lostpass.php:88
-msgid "Your new password is"
-msgstr "Jouw nieuwe wachtwoord is"
-
-#: ../../mod/lostpass.php:89
-msgid "Save or copy your new password - and then"
-msgstr "Kopieer of sla je nieuwe wachtwoord op - en"
-
-#: ../../mod/lostpass.php:90
-msgid "click here to login"
-msgstr "klik dan hier om in te loggen"
-
-#: ../../mod/lostpass.php:91
-msgid ""
-"Your password may be changed from the <em>Settings</em> page after "
-"successful login."
-msgstr "Jouw wachtwoord kan worden veranderd onder <em>instellingen</em>, nadat je succesvol bent ingelogd."
-
-#: ../../mod/lostpass.php:108
-#, php-format
-msgid "Your password has changed at %s"
-msgstr "Jouw wachtwoord op %s is veranderd"
-
-#: ../../mod/lostpass.php:123
-msgid "Forgot your Password?"
-msgstr "Wachtwoord vergeten?"
-
-#: ../../mod/lostpass.php:124
-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."
-
-#: ../../mod/lostpass.php:125
-msgid "Email Address"
-msgstr "E-mailadres"
-
-#: ../../mod/lostpass.php:126
-msgid "Reset"
-msgstr "Opnieuw instellen"
-
#: ../../mod/magic.php:69
msgid "Hub not found."
msgstr "Hub niet gevonden."
@@ -6871,10 +7011,6 @@ msgstr "Ongeldige verzoek identificator (request identifier)"
msgid "Discard"
msgstr "Annuleren"
-#: ../../mod/notifications.php:51 ../../mod/connedit.php:536
-msgid "Ignore"
-msgstr "Negeren"
-
#: ../../mod/notifications.php:94 ../../mod/notify.php:53
msgid "No more system notifications."
msgstr "Geen systeemnotificaties meer."
@@ -6920,23 +7056,23 @@ msgid ""
" 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. "
-#: ../../mod/pdledit.php:13
+#: ../../mod/pdledit.php:14
msgid "Layout updated."
msgstr "Lay-out bijgewerkt."
-#: ../../mod/pdledit.php:28 ../../mod/pdledit.php:53
+#: ../../mod/pdledit.php:29 ../../mod/pdledit.php:54
msgid "Edit System Page Description"
msgstr "Systeempagina's bewerken"
-#: ../../mod/pdledit.php:48
+#: ../../mod/pdledit.php:49
msgid "Layout not found."
msgstr "Lay-out niet gevonden."
-#: ../../mod/pdledit.php:54
+#: ../../mod/pdledit.php:55
msgid "Module Name:"
msgstr "Modulenaam:"
-#: ../../mod/pdledit.php:55
+#: ../../mod/pdledit.php:56
msgid "Layout Help"
msgstr "Lay-out-hulp"
@@ -7551,10 +7687,6 @@ msgstr "Verklaar jouw beoordeling (niet verplicht, deze informatie is openbaar)"
msgid "No ratings"
msgstr "Geen beoordelingen"
-#: ../../mod/ratings.php:99
-msgid "Ratings"
-msgstr "Waarderingen"
-
#: ../../mod/ratings.php:100
msgid "Rating: "
msgstr "Waardering: "
@@ -7995,7 +8127,7 @@ msgid "(comments displayed separately)"
msgstr "(reacties worden afzonderlijk weergeven)"
#: ../../mod/settings.php:849
-msgid "Use blog/list mode on matrix page"
+msgid "Use blog/list mode on grid page"
msgstr "Gebruik blog/lijst-modus op gridpagina"
#: ../../mod/settings.php:850
@@ -8007,7 +8139,7 @@ msgid "click to expand content exceeding this height"
msgstr "klik om inhoud uit te klappen die deze hoogte overschrijdt"
#: ../../mod/settings.php:851
-msgid "Matrix page max height of content (in pixels)"
+msgid "Grid page max height of content (in pixels)"
msgstr "Maximale hoogte berichtinhoud op gridpagina (in pixels)"
#: ../../mod/settings.php:885
@@ -8233,7 +8365,7 @@ msgid "Show visual notifications including:"
msgstr "Toon de volgende zichtbare notificaties:"
#: ../../mod/settings.php:1087
-msgid "Unseen matrix activity"
+msgid "Unseen grid activity"
msgstr "Niet bekeken grid-activiteit"
#: ../../mod/settings.php:1088
@@ -8752,259 +8884,78 @@ msgid ""
"poller."
msgstr "IMPORTANT: You will need to [manually] setup a scheduled task for the poller."
-#: ../../mod/connedit.php:75
-msgid "Could not access contact record."
-msgstr "Kon geen toegang krijgen tot de connectie-gegevens."
-
-#: ../../mod/connedit.php:99
-msgid "Could not locate selected profile."
-msgstr "Kon het gekozen profiel niet vinden."
-
-#: ../../mod/connedit.php:223
-msgid "Connection updated."
-msgstr "Connectie bijgewerkt."
-
-#: ../../mod/connedit.php:225
-msgid "Failed to update connection record."
-msgstr "Bijwerken van connectie-gegevens mislukt."
-
-#: ../../mod/connedit.php:272
-msgid "is now connected to"
-msgstr "is nu verbonden met"
-
-#: ../../mod/connedit.php:398
-msgid "Could not access address book record."
-msgstr "Kon geen toegang krijgen tot de record van de connectie."
-
-#: ../../mod/connedit.php:412
-msgid "Refresh failed - channel is currently unavailable."
-msgstr "Vernieuwen mislukt - kanaal is momenteel niet beschikbaar"
-
-#: ../../mod/connedit.php:427 ../../mod/connedit.php:436
-#: ../../mod/connedit.php:445 ../../mod/connedit.php:454
-#: ../../mod/connedit.php:467
-msgid "Unable to set address book parameters."
-msgstr "Niet in staat om de parameters van connecties in te stellen."
+#: ../../mod/lostpass.php:15
+msgid "No valid account found."
+msgstr "Geen geldige account gevonden."
-#: ../../mod/connedit.php:491
-msgid "Connection has been removed."
-msgstr "Connectie is verwijderd"
+#: ../../mod/lostpass.php:29
+msgid "Password reset request issued. Check your email."
+msgstr "Het verzoek om je wachtwoord opnieuw in te stellen is behandeld. Controleer je e-mail."
-#: ../../mod/connedit.php:510
+#: ../../mod/lostpass.php:35 ../../mod/lostpass.php:103
#, php-format
-msgid "View %s's profile"
-msgstr "Profiel van %s weergeven"
-
-#: ../../mod/connedit.php:514
-msgid "Refresh Permissions"
-msgstr "Permissies vernieuwen"
-
-#: ../../mod/connedit.php:517
-msgid "Fetch updated permissions"
-msgstr "Aangepaste permissies ophalen"
-
-#: ../../mod/connedit.php:521
-msgid "Recent Activity"
-msgstr "Kanaal-activiteit"
-
-#: ../../mod/connedit.php:524
-msgid "View recent posts and comments"
-msgstr "Recente berichten en reacties weergeven"
-
-#: ../../mod/connedit.php:531
-msgid "Block (or Unblock) all communications with this connection"
-msgstr "Blokkeer (of deblokkeer) alle communicatie met deze connectie"
-
-#: ../../mod/connedit.php:532
-msgid "This connection is blocked!"
-msgstr "Deze connectie is geblokkeerd!"
-
-#: ../../mod/connedit.php:536
-msgid "Unignore"
-msgstr "Niet meer negeren"
-
-#: ../../mod/connedit.php:539
-msgid "Ignore (or Unignore) all inbound communications from this connection"
-msgstr "Negeer (of negeer niet meer) alle inkomende communicatie van deze connectie"
-
-#: ../../mod/connedit.php:540
-msgid "This connection is ignored!"
-msgstr "Deze connectie wordt genegeerd!"
-
-#: ../../mod/connedit.php:544
-msgid "Unarchive"
-msgstr "Niet meer archiveren"
-
-#: ../../mod/connedit.php:544
-msgid "Archive"
-msgstr "Archiveren"
-
-#: ../../mod/connedit.php:547
-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"
-
-#: ../../mod/connedit.php:548
-msgid "This connection is archived!"
-msgstr "Deze connectie is gearchiveerd!"
-
-#: ../../mod/connedit.php:552
-msgid "Unhide"
-msgstr "Niet meer verbergen"
-
-#: ../../mod/connedit.php:552
-msgid "Hide"
-msgstr "Verbergen"
-
-#: ../../mod/connedit.php:555
-msgid "Hide or Unhide this connection from your other connections"
-msgstr "Deze connectie verbergen (of niet meer verbergen) voor jouw andere connecties"
-
-#: ../../mod/connedit.php:556
-msgid "This connection is hidden!"
-msgstr "Deze connectie is verborgen!"
-
-#: ../../mod/connedit.php:563
-msgid "Delete this connection"
-msgstr "Deze connectie verwijderen"
-
-#: ../../mod/connedit.php:644
-msgid "Approve this connection"
-msgstr "Deze connectie accepteren"
-
-#: ../../mod/connedit.php:644
-msgid "Accept connection to allow communication"
-msgstr "Keur deze connectie goed om communicatie toe te staan"
-
-#: ../../mod/connedit.php:649
-msgid "Set Affinity"
-msgstr "Verwantschapsfilter instellen"
-
-#: ../../mod/connedit.php:652
-msgid "Set Profile"
-msgstr "Profiel instellen"
-
-#: ../../mod/connedit.php:655
-msgid "Set Affinity & Profile"
-msgstr "Verwantschapsfilter en profiel instellen"
-
-#: ../../mod/connedit.php:688
-msgid "none"
-msgstr "geen"
-
-#: ../../mod/connedit.php:693
-msgid "Apply these permissions automatically"
-msgstr "Deze permissies automatisch toepassen"
-
-#: ../../mod/connedit.php:695
-msgid "This connection's primary address is"
-msgstr "Het primaire kanaaladres van deze connectie is"
+msgid "Site Member (%s)"
+msgstr "Lid van hub (%s)"
-#: ../../mod/connedit.php:696
-msgid "Available locations:"
-msgstr "Beschikbare locaties:"
+#: ../../mod/lostpass.php:40
+#, php-format
+msgid "Password reset requested at %s"
+msgstr "Verzoek tot het opnieuw instellen van een wachtwoord op %s is ingediend"
-#: ../../mod/connedit.php:700
+#: ../../mod/lostpass.php:63
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."
-
-#: ../../mod/connedit.php:702
-msgid "Slide to adjust your degree of friendship"
-msgstr "Schuif om te bepalen hoe goed je iemand kent en/of mag"
-
-#: ../../mod/connedit.php:704
-msgid "Slide to adjust your rating"
-msgstr "Gebruik de schuif om je beoordeling te geven"
-
-#: ../../mod/connedit.php:705 ../../mod/connedit.php:710
-msgid "Optionally explain your rating"
-msgstr "Verklaar jouw beoordeling (niet verplicht)"
-
-#: ../../mod/connedit.php:707
-msgid "Custom Filter"
-msgstr "Berichtenfilter"
-
-#: ../../mod/connedit.php:708
-msgid "Only import posts with this text"
-msgstr "Importeer alleen berichten met deze tekst"
+"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."
-#: ../../mod/connedit.php:708 ../../mod/connedit.php:709
-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"
+#: ../../mod/lostpass.php:86 ../../boot.php:1516
+msgid "Password Reset"
+msgstr "Wachtwoord vergeten?"
-#: ../../mod/connedit.php:709
-msgid "Do not import posts with this text"
-msgstr "Importeer geen berichten met deze tekst"
+#: ../../mod/lostpass.php:87
+msgid "Your password has been reset as requested."
+msgstr "Jouw wachtwoord is opnieuw ingesteld zoals je had verzocht."
-#: ../../mod/connedit.php:711
-msgid "This information is public!"
-msgstr "Deze informatie is openbaar!"
+#: ../../mod/lostpass.php:88
+msgid "Your new password is"
+msgstr "Jouw nieuwe wachtwoord is"
-#: ../../mod/connedit.php:716
-msgid "Connection Pending Approval"
-msgstr "Connectie moet nog goedgekeurd worden"
+#: ../../mod/lostpass.php:89
+msgid "Save or copy your new password - and then"
+msgstr "Kopieer of sla je nieuwe wachtwoord op - en"
-#: ../../mod/connedit.php:717
-msgid "Connection Request"
-msgstr "Connectieverzoek"
+#: ../../mod/lostpass.php:90
+msgid "click here to login"
+msgstr "klik dan hier om in te loggen"
-#: ../../mod/connedit.php:718
-#, php-format
+#: ../../mod/lostpass.php:91
msgid ""
-"(%s) would like to connect with you. Please approve this connection to allow"
-" communication."
-msgstr "(%s) wil met jou verbinden. Keur dit connectieverzoek goed om onderling te kunnen communiceren."
-
-#: ../../mod/connedit.php:720
-msgid "Approve Later"
-msgstr "Later goedkeuren"
-
-#: ../../mod/connedit.php:723
-msgid "inherited"
-msgstr "geërfd"
+"Your password may be changed from the <em>Settings</em> page after "
+"successful login."
+msgstr "Jouw wachtwoord kan worden veranderd onder <em>instellingen</em>, nadat je succesvol bent ingelogd."
-#: ../../mod/connedit.php:725
+#: ../../mod/lostpass.php:108
#, php-format
-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."
-
-#: ../../mod/connedit.php:727
-msgid "Their Settings"
-msgstr "Hun instellingen"
-
-#: ../../mod/connedit.php:728
-msgid "My Settings"
-msgstr "Mijn instellingen"
+msgid "Your password has changed at %s"
+msgstr "Jouw wachtwoord op %s is veranderd"
-#: ../../mod/connedit.php:730
-msgid "Individual Permissions"
-msgstr "Individuele permissies"
+#: ../../mod/lostpass.php:123
+msgid "Forgot your Password?"
+msgstr "Wachtwoord vergeten?"
-#: ../../mod/connedit.php:731
+#: ../../mod/lostpass.php:124
msgid ""
-"Some permissions may be inherited from your channel's <a "
-"href=\"settings\"><strong>privacy settings</strong></a>, which have higher "
-"priority than individual settings. You can <strong>not</strong> change those"
-" settings here."
-msgstr "Sommige permissies worden mogelijk overgeërfd van de <a href=\"settings\">privacy-instellingen</a> van jouw kanaal, die een hogere prioriteit hebben dan deze individuele instellingen. Je kan je deze overgeërfde permissies hier <strong>niet</strong> veranderen."
+"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."
-#: ../../mod/connedit.php:732
-msgid ""
-"Some permissions may be inherited from your channel's <a "
-"href=\"settings\"><strong>privacy settings</strong></a>, which have higher "
-"priority than individual settings. You can change those settings here but "
-"they wont have any impact unless the inherited setting changes."
-msgstr "Sommige permissies worden mogelijk overgeërfd van de <a href=\"settings\">privacy-instellingen</a> 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. "
+#: ../../mod/lostpass.php:125
+msgid "Email Address"
+msgstr "E-mailadres"
-#: ../../mod/connedit.php:733
-msgid "Last update:"
-msgstr "Laatste wijziging:"
+#: ../../mod/lostpass.php:126
+msgid "Reset"
+msgstr "Opnieuw instellen"
#: ../../mod/sharedwithme.php:94
msgid "Files: shared with me"
@@ -9296,6 +9247,10 @@ msgstr "Geen connecties."
msgid "Visit %s's profile [%s]"
msgstr "Bezoek het profiel van %s [%s]"
+#: ../../mod/viewconnections.php:101
+msgid "View Connections"
+msgstr "Connecties weergeven"
+
#: ../../mod/viewsrc.php:40
msgid "Source of Item"
msgstr "Bron van item"
@@ -9455,3 +9410,52 @@ msgstr "Grootte profielfoto's van berichten instellen"
#: ../../view/theme/redbasic/php/config.php:132
msgid "Set size of followup author photos"
msgstr "Grootte profielfoto's van reacties instellen"
+
+#: ../../boot.php:1319
+#, php-format
+msgid "Update %s failed. See error logs."
+msgstr "Update %s mislukt. Zie foutenlogboek."
+
+#: ../../boot.php:1322
+#, php-format
+msgid "Update Error at %s"
+msgstr "Update-fout op %s"
+
+#: ../../boot.php:1489
+msgid ""
+"Create an account to access services and applications within the Hubzilla"
+msgstr "Maak een account aan om toegang te krijgen tot diensten en toepassingen van Hubzilla"
+
+#: ../../boot.php:1511
+msgid "Password"
+msgstr "Wachtwoord"
+
+#: ../../boot.php:1512
+msgid "Remember me"
+msgstr "Aangemeld blijven"
+
+#: ../../boot.php:1515
+msgid "Forgot your password?"
+msgstr "Wachtwoord vergeten?"
+
+#: ../../boot.php:2137
+msgid "toggle mobile"
+msgstr "mobiele weergave omschakelen"
+
+#: ../../boot.php:2289
+msgid "Website SSL certificate is not valid. Please correct."
+msgstr "Het SSL-certificaat van deze website is ongeldig. Corrigeer dit a.u.b."
+
+#: ../../boot.php:2292
+#, php-format
+msgid "[hubzilla] Website SSL error for %s"
+msgstr "[hubzilla] Probleem met SSL-certificaat voor %s"
+
+#: ../../boot.php:2329
+msgid "Cron/Scheduled tasks not running."
+msgstr "Cron is niet actief"
+
+#: ../../boot.php:2333
+#, php-format
+msgid "[hubzilla] Cron tasks not running on %s"
+msgstr "[hubzilla] Cron-taken zijn niet actief op %s"
diff --git a/view/nl/hstrings.php b/view/nl/hstrings.php
index 1502bbb68..ca021ad76 100644
--- a/view/nl/hstrings.php
+++ b/view/nl/hstrings.php
@@ -7,25 +7,6 @@ function string_plural_select_nl($n){
;
$a->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.";
$a->strings["Welcome %s. Remote authentication successful."] = "Welkom %s. Authenticatie op afstand geslaagd.";
-$a->strings["Update %s failed. See error logs."] = "Update %s mislukt. Zie foutenlogboek.";
-$a->strings["Update Error at %s"] = "Update-fout op %s";
-$a->strings["Create an account to access services and applications within the Hubzilla"] = "Maak een account aan om toegang te krijgen tot diensten en toepassingen van Hubzilla";
-$a->strings["Register"] = "Registreren";
-$a->strings["Logout"] = "Uitloggen";
-$a->strings["Login"] = "Inloggen";
-$a->strings["Email"] = "E-mail";
-$a->strings["Password"] = "Wachtwoord";
-$a->strings["Remember me"] = "Aangemeld blijven";
-$a->strings["No"] = "Nee";
-$a->strings["Yes"] = "Ja";
-$a->strings["Forgot your password?"] = "Wachtwoord vergeten?";
-$a->strings["Password Reset"] = "Wachtwoord vergeten?";
-$a->strings["toggle mobile"] = "mobiele weergave omschakelen";
-$a->strings["Website SSL certificate is not valid. Please correct."] = "Het SSL-certificaat van deze website is ongeldig. Corrigeer dit a.u.b.";
-$a->strings["[hubzilla] Website SSL error for %s"] = "[hubzilla] Probleem met SSL-certificaat voor %s";
-$a->strings["Cron/Scheduled tasks not running."] = "Cron is niet actief";
-$a->strings["never"] = "nooit";
-$a->strings["[hubzilla] Cron tasks not running on %s"] = "[hubzilla] Cron-taken zijn niet actief op %s";
$a->strings["Connect"] = "Verbinden";
$a->strings["New window"] = "Nieuw venster";
$a->strings["Open the selected location in a different window or browser tab"] = "Open de geselecteerde locatie in een ander venster of tab";
@@ -154,6 +135,7 @@ $a->strings["Public Timeline"] = "Openbare tijdlijn";
$a->strings["Site Admin"] = "Hubbeheerder";
$a->strings["Bookmarks"] = "Bladwijzers";
$a->strings["Address Book"] = "Connecties";
+$a->strings["Login"] = "Inloggen";
$a->strings["Channel Manager"] = "Kanaalbeheer";
$a->strings["Grid"] = "Grid";
$a->strings["Settings"] = "Instellingen";
@@ -225,21 +207,6 @@ $a->strings["Invalid room specifier."] = "Ongeldige omschrijving chatkanaal";
$a->strings["Room not found."] = "Chatkanaal niet gevonden";
$a->strings["Room is full"] = "Chatkanaal is vol";
$a->strings["Default"] = "Standaard";
-$a->strings["Frequently"] = "Regelmatig";
-$a->strings["Hourly"] = "Elk uur";
-$a->strings["Twice daily"] = "Twee keer per dag";
-$a->strings["Daily"] = "Dagelijks";
-$a->strings["Weekly"] = "Wekelijks";
-$a->strings["Monthly"] = "Maandelijks";
-$a->strings["Friendica"] = "Friendica";
-$a->strings["OStatus"] = "OStatus";
-$a->strings["RSS/Atom"] = "RSS/Atom";
-$a->strings["Diaspora"] = "Diaspora";
-$a->strings["Facebook"] = "Facebook";
-$a->strings["Zot!"] = "Zot!";
-$a->strings["LinkedIn"] = "LinkedIn";
-$a->strings["XMPP/IM"] = "XMPP/IM";
-$a->strings["MySpace"] = "MySpace";
$a->strings["%d invitation available"] = array(
0 => "%d uitnodiging beschikbaar",
1 => "%d uitnodigingen beschikbaar",
@@ -291,12 +258,11 @@ $a->strings["Delete Selected Items"] = "Verwijder de geselecteerde items";
$a->strings["View Source"] = "Bron weergeven";
$a->strings["Follow Thread"] = "Conversatie volgen";
$a->strings["Unfollow Thread"] = "Conversatie niet meer volgen";
-$a->strings["View Status"] = "Status weergeven";
$a->strings["View Profile"] = "Profiel weergeven";
-$a->strings["View Photos"] = "Foto's weergeven";
-$a->strings["Activity/Posts"] = "Kanaal-activiteit";
+$a->strings["Activity/Posts"] = "Activiteit/berichten connectie";
$a->strings["Edit Connection"] = "Connectie bewerken";
-$a->strings["Send PM"] = "Privébericht verzenden";
+$a->strings["Message"] = "Bericht";
+$a->strings["Ratings"] = "Beoordelingen";
$a->strings["%s likes this."] = "%s vindt dit leuk.";
$a->strings["%s doesn't like this."] = "%s vindt dit niet leuk.";
$a->strings["<span %1\$s>%2\$d people</span> like this."] = array(
@@ -400,6 +366,7 @@ $a->strings["__ctx:noun__ Abstain"] = array(
$a->strings["Miscellaneous"] = "Diversen";
$a->strings["YYYY-MM-DD or MM-DD"] = "JJJJ-MM-DD of MM-DD";
$a->strings["Required"] = "Vereist";
+$a->strings["never"] = "nooit";
$a->strings["less than a second ago"] = "minder dan een seconde geleden";
$a->strings["year"] = "jaar";
$a->strings["years"] = "jaren";
@@ -421,6 +388,8 @@ $a->strings["Happy Birthday %1\$s"] = "Gefeliciteerd met je verjaardag %1\$s";
$a->strings["Cannot locate DNS info for database server '%s'"] = "Kan DNS-informatie voor databaseserver '%s' niet vinden";
$a->strings["Directory Options"] = "Opties kanalengids";
$a->strings["Safe Mode"] = "Veilig zoeken";
+$a->strings["No"] = "Nee";
+$a->strings["Yes"] = "Ja";
$a->strings["Public Forums Only"] = "Alleen openbare forums";
$a->strings["This Website Only"] = "Alleen deze hub";
$a->strings["\$Projectname Notification"] = "\$Projectname-notificatie";
@@ -469,71 +438,6 @@ $a->strings["Needs Action"] = "Actie vereist";
$a->strings["Completed"] = "Voltooid";
$a->strings["In Process"] = "In behandeling";
$a->strings["Cancelled"] = "Geannuleerd";
-$a->strings["General Features"] = "Algemene functies";
-$a->strings["Content Expiration"] = "Inhoud laten verlopen";
-$a->strings["Remove posts/comments and/or private messages at a future time"] = "Berichten, reacties en/of privéberichten na een bepaalde tijd verwijderen";
-$a->strings["Multiple Profiles"] = "Meerdere profielen";
-$a->strings["Ability to create multiple profiles"] = "Mogelijkheid om meerdere profielen aan te maken";
-$a->strings["Advanced Profiles"] = "Geavanceerde profielen";
-$a->strings["Additional profile sections and selections"] = "Extra onderdelen en keuzes voor je profiel";
-$a->strings["Profile Import/Export"] = "Profiel importen/exporteren";
-$a->strings["Save and load profile details across sites/channels"] = "Profielgegevens opslaan en in andere hubs/kanalen gebruiken.";
-$a->strings["Web Pages"] = "Webpagina's";
-$a->strings["Provide managed web pages on your channel"] = "Sta beheerde webpagina's op jouw kanaal toe";
-$a->strings["Private Notes"] = "Privé-aantekeningen";
-$a->strings["Enables a tool to store notes and reminders"] = "Schakelt een eenvoudige toepassing in om aantekeningen en herinneringen in op te slaan";
-$a->strings["Navigation Channel Select"] = "Kanaal kiezen in navigatiemenu";
-$a->strings["Change channels directly from within the navigation dropdown menu"] = "Kies een ander kanaal direct vanuit het dropdown-menu op de navigatiebalk";
-$a->strings["Photo Location"] = "Fotolocatie";
-$a->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.";
-$a->strings["Expert Mode"] = "Expertmodus";
-$a->strings["Enable Expert Mode to provide advanced configuration options"] = "Schakel de expertmodus in voor geavanceerde instellingen";
-$a->strings["Premium Channel"] = "Premiumkanaal";
-$a->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";
-$a->strings["Post Composition Features"] = "Functies voor het opstellen van berichten";
-$a->strings["Use Markdown"] = "Markdown gebruiken";
-$a->strings["Allow use of \"Markdown\" to format posts"] = "Sta het gebruik van \"markdown\" toe om berichten mee op te maken.";
-$a->strings["Large Photos"] = "Grote foto's";
-$a->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.";
-$a->strings["Channel Sources"] = "Kanaalbronnen";
-$a->strings["Automatically import channel content from other channels or feeds"] = "Automatisch inhoud uit andere kanalen of feeds importeren.";
-$a->strings["Even More Encryption"] = "Extra encryptie";
-$a->strings["Allow optional encryption of content end-to-end with a shared secret key"] = "Sta toe dat inhoud extra end-to-end wordt versleuteld met een gedeelde geheime sleutel.";
-$a->strings["Enable Voting Tools"] = "Peilingen inschakelen";
-$a->strings["Provide a class of post which others can vote on"] = "Maakt het mogelijk om een bericht op te stellen, waar mensen op kunnen stemmen.";
-$a->strings["Delayed Posting"] = "Berichten uitstellen";
-$a->strings["Allow posts to be published at a later date"] = "Maakt het mogelijk dat berichten op een toekomstig moment gepubliceerd kunnen worden.";
-$a->strings["Suppress Duplicate Posts/Comments"] = "Dubbele berichten/reacties tegenhouden";
-$a->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. ";
-$a->strings["Network and Stream Filtering"] = "Netwerk- en streamfilter";
-$a->strings["Search by Date"] = "Zoek op datum";
-$a->strings["Ability to select posts by date ranges"] = "Mogelijkheid om berichten op datum te filteren ";
-$a->strings["Collections Filter"] = "Filter op collecties";
-$a->strings["Enable widget to display Network posts only from selected collections"] = "Sta de widget toe om netwerkberichten te tonen van bepaalde collecties";
-$a->strings["Saved Searches"] = "Opgeslagen zoekopdrachten";
-$a->strings["Save search terms for re-use"] = "Sla zoekopdrachten op voor hergebruik";
-$a->strings["Network Personal Tab"] = "Persoonlijke netwerktab";
-$a->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";
-$a->strings["Network New Tab"] = "Nieuwe netwerktab";
-$a->strings["Enable tab to display all new Network activity"] = "Laat de tab alle nieuwe netwerkactiviteit tonen";
-$a->strings["Affinity Tool"] = "Verwantschapsfilter";
-$a->strings["Filter stream activity by depth of relationships"] = "Filter wat je in jouw grid ziet op hoe goed je iemand kent of mag";
-$a->strings["Connection Filtering"] = "Berichtenfilters";
-$a->strings["Filter incoming posts from connections based on keywords/content"] = "Filter binnenkomende berichten van connecties aan de hand van trefwoorden en taal";
-$a->strings["Suggest Channels"] = "Kanalen voorstellen";
-$a->strings["Show channel suggestions"] = "Voor jou mogelijk interessante kanalen voorstellen";
-$a->strings["Post/Comment Tools"] = "Bericht- en reactiehulpmiddelen";
-$a->strings["Community Tagging"] = "Taggen door anderen";
-$a->strings["Ability to tag existing posts"] = "Geeft andere mensen de mogelijkheid om jouw (bestaande) berichten te taggen";
-$a->strings["Post Categories"] = "Categorieën berichten";
-$a->strings["Add categories to your posts"] = "Voeg categorieën toe aan je berichten";
-$a->strings["Ability to file posts under folders"] = "Mogelijkheid om berichten in mappen op te slaan";
-$a->strings["Dislike Posts"] = "Vind berichten niet leuk";
-$a->strings["Ability to dislike posts/comments"] = "Mogelijkheid om berichten en reacties niet leuk te vinden";
-$a->strings["Star Posts"] = "Geef berichten een ster";
-$a->strings["Ability to mark special posts with a star indicator"] = "Mogelijkheid om speciale berichten met een ster te markeren";
-$a->strings["Tag Cloud"] = "Tagwolk";
-$a->strings["Provide a personal tag cloud on your channel page"] = "Zorgt voor een persoonlijke wolk met tags op jouw kanaalpagina";
$a->strings["Channel is blocked on this site."] = "Kanaal is op deze hub geblokkeerd.";
$a->strings["Channel location missing."] = "Ontbrekende kanaallocatie.";
$a->strings["Response from remote channel was incomplete."] = "Antwoord van het kanaal op afstand was niet volledig.";
@@ -543,7 +447,7 @@ $a->strings["Channel discovery failed."] = "Kanaal ontdekken mislukt.";
$a->strings["local account not found."] = "lokale account niet gevonden.";
$a->strings["Cannot connect to yourself."] = "Kan niet met jezelf verbinden";
$a->strings["A deleted group with this name was revived. Existing item permissions <strong>may</strong> apply to this group and any future members. If this is not what you intended, please create another group with a different name."] = "Een verwijderde collectie met deze naam is gereactiveerd. Bestaande itemrechten <strong>kunnen</strong> 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.";
-$a->strings["Add new connections to this collection (privacy group)"] = "Voeg nieuwe connecties aan deze collectie toe (privacy-groep)";
+$a->strings["Add new connections to this collection (privacy group)"] = "Voeg nieuwe connecties aan deze collectie toe (privacygroep)";
$a->strings["All Channels"] = "Alle kanalen";
$a->strings["edit"] = "bewerken";
$a->strings["Collections"] = "Collecties";
@@ -551,84 +455,9 @@ $a->strings["Edit collection"] = "Collectie bewerken";
$a->strings["Add new collection"] = "Nieuwe collectie toevoegen";
$a->strings["Channels not in any collection"] = "Kanalen die zich in geen enkele collectie bevinden";
$a->strings["add"] = "toevoegen";
-$a->strings["Unable to obtain identity information from database"] = "Niet in staat om identiteitsinformatie uit de database te verkrijgen";
-$a->strings["Empty name"] = "Ontbrekende naam";
-$a->strings["Name too long"] = "Naam te lang";
-$a->strings["No account identifier"] = "Geen account-identificator";
-$a->strings["Nickname is required."] = "Bijnaam is verplicht";
-$a->strings["Reserved nickname. Please choose another."] = "Deze naam is gereserveerd. Kies een andere.";
-$a->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.";
-$a->strings["Unable to retrieve created identity"] = "Niet in staat om aangemaakte identiteit te vinden";
-$a->strings["Default Profile"] = "Standaardprofiel";
-$a->strings["Friends"] = "Vrienden";
-$a->strings["Requested channel is not available."] = "Opgevraagd kanaal is niet beschikbaar.";
-$a->strings["Requested profile is not available."] = "Opgevraagd profiel is niet beschikbaar";
-$a->strings["Change profile photo"] = "Profielfoto veranderen";
-$a->strings["Profiles"] = "Profielen";
-$a->strings["Manage/edit profiles"] = "Profielen beheren/bewerken";
-$a->strings["Create New Profile"] = "Nieuw profiel aanmaken";
-$a->strings["Edit Profile"] = "Profiel bewerken";
-$a->strings["Profile Image"] = "Profielfoto";
-$a->strings["visible to everybody"] = "Voor iedereen zichtbaar";
-$a->strings["Edit visibility"] = "Zichtbaarheid bewerken";
-$a->strings["Gender:"] = "Geslacht:";
-$a->strings["Status:"] = "Status:";
-$a->strings["Homepage:"] = "Homepagina:";
-$a->strings["Online Now"] = "Nu online";
-$a->strings["g A l F d"] = "G:i, l d F";
-$a->strings["F d"] = "d F";
-$a->strings["[today]"] = "[vandaag]";
-$a->strings["Birthday Reminders"] = "Verjaardagsherinneringen";
-$a->strings["Birthdays this week:"] = "Verjaardagen deze week:";
-$a->strings["[No description]"] = "[Geen omschrijving]";
-$a->strings["Event Reminders"] = "Herinneringen";
-$a->strings["Events this week:"] = "Gebeurtenissen deze week:";
-$a->strings["Full Name:"] = "Volledige naam:";
-$a->strings["Like this channel"] = "Vind dit kanaal leuk";
-$a->strings["j F, Y"] = "F j Y";
-$a->strings["j F"] = "F j";
-$a->strings["Birthday:"] = "Geboortedatum:";
-$a->strings["Age:"] = "Leeftijd:";
-$a->strings["for %1\$d %2\$s"] = "voor %1\$d %2\$s";
-$a->strings["Sexual Preference:"] = "Seksuele voorkeur:";
-$a->strings["Hometown:"] = "Oorspronkelijk uit:";
-$a->strings["Tags:"] = "Tags:";
-$a->strings["Political Views:"] = "Politieke overtuigingen:";
-$a->strings["Religion:"] = "Religie:";
-$a->strings["About:"] = "Over:";
-$a->strings["Hobbies/Interests:"] = "Hobby's/interesses:";
-$a->strings["Likes:"] = "Houdt van:";
-$a->strings["Dislikes:"] = "Houdt niet van:";
-$a->strings["Contact information and Social Networks:"] = "Contactinformatie en sociale netwerken:";
-$a->strings["My other channels:"] = "Mijn andere kanalen";
-$a->strings["Musical interests:"] = "Muzikale interesses:";
-$a->strings["Books, literature:"] = "Boeken, literatuur:";
-$a->strings["Television:"] = "Televisie:";
-$a->strings["Film/dance/culture/entertainment:"] = "Films/dansen/cultuur/vermaak:";
-$a->strings["Love/Romance:"] = "Liefde/romantiek:";
-$a->strings["Work/employment:"] = "Werk/beroep:";
-$a->strings["School/education:"] = "School/opleiding:";
-$a->strings["Like this thing"] = "Vind dit ding leuk";
-$a->strings["cover photo"] = "omslagfoto";
$a->strings["Cannot create a duplicate channel identifier on this system. Import failed."] = "Kan geen dubbele kanaal-identificator op deze hub aanmaken. Importeren mislukt.";
$a->strings["Channel clone failed. Import failed."] = "Het klonen van het kanaal is mislukt. Importeren mislukt.";
$a->strings["Cloned channel not found. Import failed."] = "Gekloond kanaal niet gevonden. Importeren mislukt.";
-$a->strings["Permission denied"] = "Toegang geweigerd";
-$a->strings["(Unknown)"] = "(Onbekend)";
-$a->strings["Visible to anybody on the internet."] = "Voor iedereen op het internet zichtbaar.";
-$a->strings["Visible to you only."] = "Alleen voor jou zichtbaar.";
-$a->strings["Visible to anybody in this network."] = "Voor iedereen in dit netwerk zichtbaar.";
-$a->strings["Visible to anybody authenticated."] = "Voor iedereen die geauthenticeerd is zichtbaar.";
-$a->strings["Visible to anybody on %s."] = "Voor iedereen op %s zichtbaar.";
-$a->strings["Visible to all connections."] = "Voor alle connecties zichtbaar.";
-$a->strings["Visible to approved connections."] = "Voor alle goedgekeurde connecties zichtbaar.";
-$a->strings["Visible to specific connections."] = "Voor specifieke connecties zichtbaar.";
-$a->strings["Item not found."] = "Item niet gevonden.";
-$a->strings["Collection not found."] = "Collectie niet gevonden.";
-$a->strings["Collection is empty."] = "Collectie is leeg";
-$a->strings["Collection: %s"] = "Collectie: %s";
-$a->strings["Connection: %s"] = "Connectie: %s";
-$a->strings["Connection not found."] = "Connectie niet gevonden.";
$a->strings["Delete this item?"] = "Dit item verwijderen?";
$a->strings["[-] show less"] = "[-] minder reacties weergeven";
$a->strings["[+] expand"] = "[+] uitklappen";
@@ -711,12 +540,14 @@ $a->strings["No recipient provided."] = "Geen ontvanger opgegeven.";
$a->strings["[no subject]"] = "[geen onderwerp]";
$a->strings["Unable to determine sender."] = "Afzender kan niet bepaald worden.";
$a->strings["Stored post could not be verified."] = "Opgeslagen bericht kon niet worden geverifieerd.";
+$a->strings["Logout"] = "Uitloggen";
$a->strings["End this session"] = "Beëindig deze sessie";
$a->strings["Home"] = "Home";
$a->strings["Your posts and conversations"] = "Jouw kanaal";
$a->strings["Your profile page"] = "Jouw profielpagina";
$a->strings["Edit Profiles"] = "Bewerk profielen";
$a->strings["Manage/Edit profiles"] = "Beheer/wijzig profielen";
+$a->strings["Edit Profile"] = "Profiel bewerken";
$a->strings["Edit your profile"] = "Jouw profiel bewerken";
$a->strings["Your photos"] = "Jouw foto's";
$a->strings["Your files"] = "Jouw bestanden";
@@ -728,6 +559,7 @@ $a->strings["%s - click to logout"] = "%s - klik om uit te loggen";
$a->strings["Remote authentication"] = "Authenticatie op afstand";
$a->strings["Click to authenticate to your home hub"] = "Authenticeer jezelf via (bijvoorbeeld) jouw hub";
$a->strings["Home Page"] = "Homepage";
+$a->strings["Register"] = "Registreren";
$a->strings["Create an account"] = "Maak een account aan";
$a->strings["Help and documentation"] = "Hulp en documentatie";
$a->strings["Apps"] = "Apps";
@@ -845,6 +677,7 @@ $a->strings["Infatuated"] = "Smoorverliefd";
$a->strings["Dating"] = "Aan het daten";
$a->strings["Unfaithful"] = "Ontrouw";
$a->strings["Sex Addict"] = "Seksverslaafd";
+$a->strings["Friends"] = "Vrienden";
$a->strings["Friends/Benefits"] = "Vriendschap plus";
$a->strings["Casual"] = "Ongebonden/vluchtig";
$a->strings["Engaged"] = "Verloofd";
@@ -875,6 +708,150 @@ $a->strings["want"] = "wil";
$a->strings["wants"] = "wil";
$a->strings["likes"] = "vindt dit leuk";
$a->strings["dislikes"] = "vindt dit niet leuk";
+$a->strings["Invalid data packet"] = "Datapakket ongeldig";
+$a->strings["Unable to verify channel signature"] = "Kanaalkenmerk kon niet worden geverifieerd. ";
+$a->strings["Unable to verify site signature for %s"] = "Hubkenmerk voor %s kon niet worden geverifieerd";
+$a->strings["invalid target signature"] = "ongeldig doelkenmerk";
+$a->strings["Frequently"] = "Regelmatig";
+$a->strings["Hourly"] = "Elk uur";
+$a->strings["Twice daily"] = "Twee keer per dag";
+$a->strings["Daily"] = "Dagelijks";
+$a->strings["Weekly"] = "Wekelijks";
+$a->strings["Monthly"] = "Maandelijks";
+$a->strings["Friendica"] = "Friendica";
+$a->strings["OStatus"] = "OStatus";
+$a->strings["RSS/Atom"] = "RSS/Atom";
+$a->strings["Email"] = "E-mail";
+$a->strings["Diaspora"] = "Diaspora";
+$a->strings["Facebook"] = "Facebook";
+$a->strings["Zot"] = "Zot";
+$a->strings["LinkedIn"] = "LinkedIn";
+$a->strings["XMPP/IM"] = "XMPP/IM";
+$a->strings["MySpace"] = "MySpace";
+$a->strings["General Features"] = "Algemene functies";
+$a->strings["Content Expiration"] = "Inhoud laten verlopen";
+$a->strings["Remove posts/comments and/or private messages at a future time"] = "Berichten, reacties en/of privéberichten na een bepaalde tijd verwijderen";
+$a->strings["Multiple Profiles"] = "Meerdere profielen";
+$a->strings["Ability to create multiple profiles"] = "Mogelijkheid om meerdere profielen aan te maken";
+$a->strings["Advanced Profiles"] = "Geavanceerde profielen";
+$a->strings["Additional profile sections and selections"] = "Extra onderdelen en keuzes voor je profiel";
+$a->strings["Profile Import/Export"] = "Profiel importen/exporteren";
+$a->strings["Save and load profile details across sites/channels"] = "Profielgegevens opslaan en in andere hubs/kanalen gebruiken.";
+$a->strings["Web Pages"] = "Webpagina's";
+$a->strings["Provide managed web pages on your channel"] = "Sta beheerde webpagina's op jouw kanaal toe";
+$a->strings["Hide Rating"] = "Beoordelingen verbergen";
+$a->strings["Hide the rating buttons on your channel and profile pages. Note: People can still rate you somewhere else."] = "Verbergt de beoordelingsknoppen op jouw kanaal- en profielpagina's. Let op: Mensen kunnen jou nog steeds ergens anders beoordelen. ";
+$a->strings["Private Notes"] = "Privé-aantekeningen";
+$a->strings["Enables a tool to store notes and reminders"] = "Schakelt een eenvoudige toepassing in om aantekeningen en herinneringen in op te slaan";
+$a->strings["Navigation Channel Select"] = "Kanaal kiezen in navigatiemenu";
+$a->strings["Change channels directly from within the navigation dropdown menu"] = "Kies een ander kanaal direct vanuit het dropdown-menu op de navigatiebalk";
+$a->strings["Photo Location"] = "Fotolocatie";
+$a->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.";
+$a->strings["Expert Mode"] = "Expertmodus";
+$a->strings["Enable Expert Mode to provide advanced configuration options"] = "Schakel de expertmodus in voor geavanceerde instellingen";
+$a->strings["Premium Channel"] = "Premiumkanaal";
+$a->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";
+$a->strings["Post Composition Features"] = "Functies voor het opstellen van berichten";
+$a->strings["Use Markdown"] = "Markdown gebruiken";
+$a->strings["Allow use of \"Markdown\" to format posts"] = "Sta het gebruik van \"markdown\" toe om berichten mee op te maken.";
+$a->strings["Large Photos"] = "Grote foto's";
+$a->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.";
+$a->strings["Channel Sources"] = "Kanaalbronnen";
+$a->strings["Automatically import channel content from other channels or feeds"] = "Automatisch inhoud uit andere kanalen of feeds importeren.";
+$a->strings["Even More Encryption"] = "Extra encryptie";
+$a->strings["Allow optional encryption of content end-to-end with a shared secret key"] = "Sta toe dat inhoud extra end-to-end wordt versleuteld met een gedeelde geheime sleutel.";
+$a->strings["Enable Voting Tools"] = "Peilingen inschakelen";
+$a->strings["Provide a class of post which others can vote on"] = "Maakt het mogelijk om een bericht op te stellen, waar mensen op kunnen stemmen.";
+$a->strings["Delayed Posting"] = "Berichten uitstellen";
+$a->strings["Allow posts to be published at a later date"] = "Maakt het mogelijk dat berichten op een toekomstig moment gepubliceerd kunnen worden.";
+$a->strings["Suppress Duplicate Posts/Comments"] = "Dubbele berichten/reacties tegenhouden";
+$a->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. ";
+$a->strings["Network and Stream Filtering"] = "Netwerk- en streamfilter";
+$a->strings["Search by Date"] = "Zoek op datum";
+$a->strings["Ability to select posts by date ranges"] = "Mogelijkheid om berichten op datum te filteren ";
+$a->strings["Collections (Privacy Groups)"] = "Collecties (privacygroepen)";
+$a->strings["Enable widget to display Network posts only from selected collections"] = "Sta de widget toe om netwerkberichten te tonen van bepaalde collecties";
+$a->strings["Saved Searches"] = "Opgeslagen zoekopdrachten";
+$a->strings["Save search terms for re-use"] = "Sla zoekopdrachten op voor hergebruik";
+$a->strings["Network Personal Tab"] = "Persoonlijke netwerktab";
+$a->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";
+$a->strings["Network New Tab"] = "Nieuwe netwerktab";
+$a->strings["Enable tab to display all new Network activity"] = "Laat de tab alle nieuwe netwerkactiviteit tonen";
+$a->strings["Affinity Tool"] = "Verwantschapsfilter";
+$a->strings["Filter stream activity by depth of relationships"] = "Filter wat je in jouw grid ziet op hoe goed je iemand kent of mag";
+$a->strings["Connection Filtering"] = "Berichtenfilters";
+$a->strings["Filter incoming posts from connections based on keywords/content"] = "Filter binnenkomende berichten van connecties aan de hand van trefwoorden en taal";
+$a->strings["Suggest Channels"] = "Kanalen voorstellen";
+$a->strings["Show channel suggestions"] = "Voor jou mogelijk interessante kanalen voorstellen";
+$a->strings["Post/Comment Tools"] = "Bericht- en reactiehulpmiddelen";
+$a->strings["Community Tagging"] = "Taggen door anderen";
+$a->strings["Ability to tag existing posts"] = "Geeft andere mensen de mogelijkheid om jouw (bestaande) berichten te taggen";
+$a->strings["Post Categories"] = "Categorieën berichten";
+$a->strings["Add categories to your posts"] = "Voeg categorieën toe aan je berichten";
+$a->strings["Ability to file posts under folders"] = "Mogelijkheid om berichten in mappen op te slaan";
+$a->strings["Dislike Posts"] = "Vind berichten niet leuk";
+$a->strings["Ability to dislike posts/comments"] = "Mogelijkheid om berichten en reacties niet leuk te vinden";
+$a->strings["Star Posts"] = "Geef berichten een ster";
+$a->strings["Ability to mark special posts with a star indicator"] = "Mogelijkheid om speciale berichten met een ster te markeren";
+$a->strings["Tag Cloud"] = "Tagwolk";
+$a->strings["Provide a personal tag cloud on your channel page"] = "Zorgt voor een persoonlijke wolk met tags op jouw kanaalpagina";
+$a->strings["Unable to obtain identity information from database"] = "Niet in staat om identiteitsinformatie uit de database te verkrijgen";
+$a->strings["Empty name"] = "Ontbrekende naam";
+$a->strings["Name too long"] = "Naam te lang";
+$a->strings["No account identifier"] = "Geen account-identificator";
+$a->strings["Nickname is required."] = "Bijnaam is verplicht";
+$a->strings["Reserved nickname. Please choose another."] = "Deze naam is gereserveerd. Kies een andere.";
+$a->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.";
+$a->strings["Unable to retrieve created identity"] = "Niet in staat om aangemaakte identiteit te vinden";
+$a->strings["Default Profile"] = "Standaardprofiel";
+$a->strings["Requested channel is not available."] = "Opgevraagd kanaal is niet beschikbaar.";
+$a->strings["Requested profile is not available."] = "Opgevraagd profiel is niet beschikbaar";
+$a->strings["Change profile photo"] = "Profielfoto veranderen";
+$a->strings["Profiles"] = "Profielen";
+$a->strings["Manage/edit profiles"] = "Profielen beheren/bewerken";
+$a->strings["Create New Profile"] = "Nieuw profiel aanmaken";
+$a->strings["Profile Image"] = "Profielfoto";
+$a->strings["visible to everybody"] = "Voor iedereen zichtbaar";
+$a->strings["Edit visibility"] = "Zichtbaarheid bewerken";
+$a->strings["Gender:"] = "Geslacht:";
+$a->strings["Status:"] = "Status:";
+$a->strings["Homepage:"] = "Homepagina:";
+$a->strings["Online Now"] = "Nu online";
+$a->strings["g A l F d"] = "G:i, l d F";
+$a->strings["F d"] = "d F";
+$a->strings["[today]"] = "[vandaag]";
+$a->strings["Birthday Reminders"] = "Verjaardagsherinneringen";
+$a->strings["Birthdays this week:"] = "Verjaardagen deze week:";
+$a->strings["[No description]"] = "[Geen omschrijving]";
+$a->strings["Event Reminders"] = "Herinneringen";
+$a->strings["Events this week:"] = "Gebeurtenissen deze week:";
+$a->strings["Full Name:"] = "Volledige naam:";
+$a->strings["Like this channel"] = "Vind dit kanaal leuk";
+$a->strings["j F, Y"] = "F j Y";
+$a->strings["j F"] = "F j";
+$a->strings["Birthday:"] = "Geboortedatum:";
+$a->strings["Age:"] = "Leeftijd:";
+$a->strings["for %1\$d %2\$s"] = "voor %1\$d %2\$s";
+$a->strings["Sexual Preference:"] = "Seksuele voorkeur:";
+$a->strings["Hometown:"] = "Oorspronkelijk uit:";
+$a->strings["Tags:"] = "Tags:";
+$a->strings["Political Views:"] = "Politieke overtuigingen:";
+$a->strings["Religion:"] = "Religie:";
+$a->strings["About:"] = "Over:";
+$a->strings["Hobbies/Interests:"] = "Hobby's/interesses:";
+$a->strings["Likes:"] = "Houdt van:";
+$a->strings["Dislikes:"] = "Houdt niet van:";
+$a->strings["Contact information and Social Networks:"] = "Contactinformatie en sociale netwerken:";
+$a->strings["My other channels:"] = "Mijn andere kanalen";
+$a->strings["Musical interests:"] = "Muzikale interesses:";
+$a->strings["Books, literature:"] = "Boeken, literatuur:";
+$a->strings["Television:"] = "Televisie:";
+$a->strings["Film/dance/culture/entertainment:"] = "Films/dansen/cultuur/vermaak:";
+$a->strings["Love/Romance:"] = "Liefde/romantiek:";
+$a->strings["Work/employment:"] = "Werk/beroep:";
+$a->strings["School/education:"] = "School/opleiding:";
+$a->strings["Like this thing"] = "Vind dit ding leuk";
+$a->strings["cover photo"] = "omslagfoto";
$a->strings["prev"] = "vorige";
$a->strings["first"] = "eerste";
$a->strings["last"] = "laatste";
@@ -882,11 +859,7 @@ $a->strings["next"] = "volgende";
$a->strings["older"] = "ouder";
$a->strings["newer"] = "nieuwer";
$a->strings["No connections"] = "Geen connecties";
-$a->strings["%d Connection"] = array(
- 0 => "%d connectie",
- 1 => "%d connecties",
-);
-$a->strings["View Connections"] = "Connecties weergeven";
+$a->strings["View all %s connections"] = "Toon alle %s connecties";
$a->strings["Save"] = "Opslaan";
$a->strings["poke"] = "aanstoten";
$a->strings["ping"] = "ping";
@@ -938,10 +911,6 @@ $a->strings["Blocks"] = "Blokken";
$a->strings["Menus"] = "Menu's";
$a->strings["Layouts"] = "Lay-outs";
$a->strings["Pages"] = "Pagina's";
-$a->strings["Invalid data packet"] = "Datapakket ongeldig";
-$a->strings["Unable to verify channel signature"] = "Kanaalkenmerk kon niet worden geverifieerd. ";
-$a->strings["Unable to verify site signature for %s"] = "Hubkenmerk voor %s kon niet worden geverifieerd";
-$a->strings["invalid target signature"] = "ongeldig doelkenmerk";
$a->strings["System"] = "Systeem";
$a->strings["Create Personal App"] = "Persoonlijke app maken";
$a->strings["Edit Personal App"] = "Persoonlijke app bewerken";
@@ -989,6 +958,7 @@ $a->strings["Chat Rooms"] = "Chatkanalen";
$a->strings["Bookmarked Chatrooms"] = "Bladwijzers van chatkanalen";
$a->strings["Suggested Chatrooms"] = "Voorgestelde chatkanalen";
$a->strings["photo/image"] = "foto/afbeelding";
+$a->strings["Rating Tools"] = "Beoordelingen";
$a->strings["Rate Me"] = "Beoordeel mij";
$a->strings["View Ratings"] = "Bekijk beoordelingen";
$a->strings["Public Hubs"] = "Openbare hubs";
@@ -1012,6 +982,22 @@ $a->strings["Plugin Features"] = "Plug-in-opties";
$a->strings["User registrations waiting for confirmation"] = "Accounts die op goedkeuring wachten";
$a->strings["View Photo"] = "Foto weergeven";
$a->strings["Edit Album"] = "Album bewerken";
+$a->strings["Permission denied"] = "Toegang geweigerd";
+$a->strings["(Unknown)"] = "(Onbekend)";
+$a->strings["Visible to anybody on the internet."] = "Voor iedereen op het internet zichtbaar.";
+$a->strings["Visible to you only."] = "Alleen voor jou zichtbaar.";
+$a->strings["Visible to anybody in this network."] = "Voor iedereen in dit netwerk zichtbaar.";
+$a->strings["Visible to anybody authenticated."] = "Voor iedereen die geauthenticeerd is zichtbaar.";
+$a->strings["Visible to anybody on %s."] = "Voor iedereen op %s zichtbaar.";
+$a->strings["Visible to all connections."] = "Voor alle connecties zichtbaar.";
+$a->strings["Visible to approved connections."] = "Voor alle geaccepteerde connecties zichtbaar.";
+$a->strings["Visible to specific connections."] = "Voor specifieke connecties zichtbaar.";
+$a->strings["Item not found."] = "Item niet gevonden.";
+$a->strings["Collection not found."] = "Collectie niet gevonden.";
+$a->strings["Collection is empty."] = "Collectie is leeg";
+$a->strings["Collection: %s"] = "Collectie: %s";
+$a->strings["Connection: %s"] = "Connectie: %s";
+$a->strings["Connection not found."] = "Connectie niet gevonden.";
$a->strings["Not Found"] = "Niet gevonden";
$a->strings["Page not found."] = "Pagina niet gevonden.";
$a->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 <a href=\"directory\">kanalengids</a>, om kanalen te vinden. Rechtsboven vind je ook <a href=\"directory\">apps</a>, waar je vrijwel alle functies van \$Projectname kunt vinden. Voor <a href=\"directory\">hulp</a> met \$Projectname klik je op het vraagteken.";
@@ -1100,7 +1086,7 @@ $a->strings["Poll interval"] = "Poll-interval";
$a->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.";
$a->strings["Maximum Load Average"] = "Maximaal gemiddelde systeembelasting";
$a->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.";
-$a->strings["Expiration period in days for imported (matrix/network) content"] = "Aantal dagen waarna geïmporteerde inhoud uit iemands grid/netwerk-pagina wordt verwijderd.";
+$a->strings["Expiration period in days for imported (grid/network) content"] = "Aantal dagen waarna geïmporteerde inhoud uit iemands grid/netwerk-pagina wordt verwijderd.";
$a->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.";
$a->strings["Off"] = "Uit";
$a->strings["On"] = "Aan";
@@ -1276,13 +1262,73 @@ $a->strings["Only show blocked connections"] = "Toon alleen geblokkeerde connect
$a->strings["Only show ignored connections"] = "Toon alleen genegeerde connecties";
$a->strings["Only show archived connections"] = "Toon alleen gearchiveerde connecties";
$a->strings["Only show hidden connections"] = "Toon alleen verborgen connecties";
-$a->strings["Pending"] = "Nog niet goedgekeurd";
+$a->strings["Pending approval"] = "Moet nog geaccepteerd worden";
$a->strings["%1\$s [%2\$s]"] = "%1\$s [%2\$s]";
$a->strings["Edit connection"] = "Connectie bewerken";
$a->strings["Delete connection"] = "Connectie verwijderen";
+$a->strings["Channel address"] = "Kanaaladres";
+$a->strings["Network"] = "Netwerk";
$a->strings["Connected"] = "Verbonden";
+$a->strings["Approve connection"] = "Connectie accepteren";
+$a->strings["Recent activity"] = "Recente activiteit";
$a->strings["Search your connections"] = "Doorzoek jouw connecties";
$a->strings["Connections search"] = "Connecties zoeken";
+$a->strings["Could not access contact record."] = "Kon geen toegang krijgen tot de connectie-gegevens.";
+$a->strings["Could not locate selected profile."] = "Kon het gekozen profiel niet vinden.";
+$a->strings["Connection updated."] = "Connectie bijgewerkt.";
+$a->strings["Failed to update connection record."] = "Bijwerken van connectie-gegevens mislukt.";
+$a->strings["is now connected to"] = "is nu verbonden met";
+$a->strings["Could not access address book record."] = "Kon geen toegang krijgen tot de record van de connectie.";
+$a->strings["Refresh failed - channel is currently unavailable."] = "Vernieuwen mislukt - kanaal is momenteel niet beschikbaar";
+$a->strings["Unable to set address book parameters."] = "Niet in staat om de parameters van connecties in te stellen.";
+$a->strings["Connection has been removed."] = "Connectie is verwijderd";
+$a->strings["View %s's profile"] = "Profiel van %s weergeven";
+$a->strings["Refresh Permissions"] = "Permissies vernieuwen";
+$a->strings["Fetch updated permissions"] = "Aangepaste permissies ophalen";
+$a->strings["Recent Activity"] = "Recente activiteit/berichten";
+$a->strings["View recent posts and comments"] = "Recente berichten en reacties weergeven";
+$a->strings["Block (or Unblock) all communications with this connection"] = "Blokkeer (of deblokkeer) alle communicatie met deze connectie";
+$a->strings["This connection is blocked!"] = "Deze connectie is geblokkeerd!";
+$a->strings["Unignore"] = "Niet meer negeren";
+$a->strings["Ignore"] = "Negeren";
+$a->strings["Ignore (or Unignore) all inbound communications from this connection"] = "Negeer (of negeer niet meer) alle inkomende communicatie van deze connectie";
+$a->strings["This connection is ignored!"] = "Deze connectie wordt genegeerd!";
+$a->strings["Unarchive"] = "Niet meer archiveren";
+$a->strings["Archive"] = "Archiveren";
+$a->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";
+$a->strings["This connection is archived!"] = "Deze connectie is gearchiveerd!";
+$a->strings["Unhide"] = "Niet meer verbergen";
+$a->strings["Hide"] = "Verbergen";
+$a->strings["Hide or Unhide this connection from your other connections"] = "Deze connectie verbergen (of niet meer verbergen) voor jouw andere connecties";
+$a->strings["This connection is hidden!"] = "Deze connectie is verborgen!";
+$a->strings["Delete this connection"] = "Deze connectie verwijderen";
+$a->strings["Approve this connection"] = "Deze connectie accepteren";
+$a->strings["Accept connection to allow communication"] = "Keur deze connectie goed om communicatie toe te staan";
+$a->strings["Set Affinity"] = "Verwantschapsfilter instellen";
+$a->strings["Set Profile"] = "Profiel instellen";
+$a->strings["Set Affinity & Profile"] = "Verwantschapsfilter en profiel instellen";
+$a->strings["none"] = "geen";
+$a->strings["Apply these permissions automatically"] = "Deze permissies automatisch toepassen";
+$a->strings["This connection's primary address is"] = "Het primaire kanaaladres van deze connectie is";
+$a->strings["Available locations:"] = "Beschikbare locaties:";
+$a->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.";
+$a->strings["Slide to adjust your degree of friendship"] = "Schuif om te bepalen hoe goed je iemand kent en/of mag";
+$a->strings["Slide to adjust your rating"] = "Gebruik de schuif om je beoordeling te geven";
+$a->strings["Optionally explain your rating"] = "Verklaar jouw beoordeling (niet verplicht)";
+$a->strings["Custom Filter"] = "Berichtenfilter";
+$a->strings["Only import posts with this text"] = "Importeer alleen berichten met deze tekst";
+$a->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";
+$a->strings["Do not import posts with this text"] = "Importeer geen berichten met deze tekst";
+$a->strings["This information is public!"] = "Deze informatie is openbaar!";
+$a->strings["Connection Pending Approval"] = "Connectie moet nog geaccepteerd worden";
+$a->strings["inherited"] = "geërfd";
+$a->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.";
+$a->strings["Their Settings"] = "Hun instellingen";
+$a->strings["My Settings"] = "Mijn instellingen";
+$a->strings["Individual Permissions"] = "Individuele permissies";
+$a->strings["Some permissions may be inherited from your channel's <a href=\"settings\"><strong>privacy settings</strong></a>, which have higher priority than individual settings. You can <strong>not</strong> change those settings here."] = "Sommige permissies worden mogelijk overgeërfd van de <a href=\"settings\">privacy-instellingen</a> van jouw kanaal, die een hogere prioriteit hebben dan deze individuele instellingen. Je kan je deze overgeërfde permissies hier <strong>niet</strong> veranderen.";
+$a->strings["Some permissions may be inherited from your channel's <a href=\"settings\"><strong>privacy settings</strong></a>, which have higher priority than individual settings. You can change those settings here but they wont have any impact unless the inherited setting changes."] = "Sommige permissies worden mogelijk overgeërfd van de <a href=\"settings\">privacy-instellingen</a> 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. ";
+$a->strings["Last update:"] = "Laatste wijziging:";
$a->strings["\$Projectname channel"] = "\$Projectname-kanaal";
$a->strings["Public access denied."] = "Openbare toegang geweigerd.";
$a->strings["%d rating"] = array(
@@ -1509,21 +1555,6 @@ $a->strings["Sync now"] = "Nu synchroniseren";
$a->strings["Please wait several minutes between consecutive operations."] = "Wacht enkele minuten tussen opeenvolgende handelingen.";
$a->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.";
$a->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.";
-$a->strings["No valid account found."] = "Geen geldige account gevonden.";
-$a->strings["Password reset request issued. Check your email."] = "Het verzoek om je wachtwoord opnieuw in te stellen is behandeld. Controleer je e-mail.";
-$a->strings["Site Member (%s)"] = "Lid van hub (%s)";
-$a->strings["Password reset requested at %s"] = "Verzoek tot het opnieuw instellen van een wachtwoord op %s is ingediend";
-$a->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.";
-$a->strings["Your password has been reset as requested."] = "Jouw wachtwoord is opnieuw ingesteld zoals je had verzocht.";
-$a->strings["Your new password is"] = "Jouw nieuwe wachtwoord is";
-$a->strings["Save or copy your new password - and then"] = "Kopieer of sla je nieuwe wachtwoord op - en";
-$a->strings["click here to login"] = "klik dan hier om in te loggen";
-$a->strings["Your password may be changed from the <em>Settings</em> page after successful login."] = "Jouw wachtwoord kan worden veranderd onder <em>instellingen</em>, nadat je succesvol bent ingelogd.";
-$a->strings["Your password has changed at %s"] = "Jouw wachtwoord op %s is veranderd";
-$a->strings["Forgot your Password?"] = "Wachtwoord vergeten?";
-$a->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.";
-$a->strings["Email Address"] = "E-mailadres";
-$a->strings["Reset"] = "Opnieuw instellen";
$a->strings["Hub not found."] = "Hub niet gevonden.";
$a->strings["Unable to lookup recipient."] = "Niet in staat om ontvanger op te zoeken.";
$a->strings["Unable to communicate with requested channel."] = "Niet in staat om met het aangevraagde kanaal te communiceren.";
@@ -1631,7 +1662,6 @@ $a->strings["Channel Type"] = "Kanaaltype";
$a->strings["Read more about roles"] = "Lees meer over kanaaltypes";
$a->strings["Invalid request identifier."] = "Ongeldige verzoek identificator (request identifier)";
$a->strings["Discard"] = "Annuleren";
-$a->strings["Ignore"] = "Negeren";
$a->strings["No more system notifications."] = "Geen systeemnotificaties meer.";
$a->strings["System Notifications"] = "Systeemnotificaties";
$a->strings["Unable to find your hub."] = "Niet in staat om je hub te vinden";
@@ -1794,8 +1824,7 @@ $a->strings["Remote Channel [%s] (not yet known on this site)"] = "Kanaal op afs
$a->strings["Rating (this information is public)"] = "Beoordeling (deze informatie is openbaar)";
$a->strings["Optionally explain your rating (this information is public)"] = "Verklaar jouw beoordeling (niet verplicht, deze informatie is openbaar)";
$a->strings["No ratings"] = "Geen beoordelingen";
-$a->strings["Ratings"] = "Waarderingen";
-$a->strings["Rating: "] = "Waardering: ";
+$a->strings["Rating: "] = "Beoordeling: ";
$a->strings["Website: "] = "Website: ";
$a->strings["Description: "] = "Omschrijving: ";
$a->strings["Select a bookmark folder"] = "Kies een bladwijzermap";
@@ -1898,10 +1927,10 @@ $a->strings["Link post titles to source"] = "Berichtkoppen naar originele locati
$a->strings["System Page Layout Editor - (advanced)"] = "Lay-out bewerken van systeempagina's (geavanceerd)";
$a->strings["Use blog/list mode on channel page"] = "Gebruik blog/lijst-modus op kanaalpagina";
$a->strings["(comments displayed separately)"] = "(reacties worden afzonderlijk weergeven)";
-$a->strings["Use blog/list mode on matrix page"] = "Gebruik blog/lijst-modus op gridpagina";
+$a->strings["Use blog/list mode on grid page"] = "Gebruik blog/lijst-modus op gridpagina";
$a->strings["Channel page max height of content (in pixels)"] = "Maximale hoogte berichtinhoud op kanaalpagina (in pixels)";
$a->strings["click to expand content exceeding this height"] = "klik om inhoud uit te klappen die deze hoogte overschrijdt";
-$a->strings["Matrix page max height of content (in pixels)"] = "Maximale hoogte berichtinhoud op gridpagina (in pixels)";
+$a->strings["Grid page max height of content (in pixels)"] = "Maximale hoogte berichtinhoud op gridpagina (in pixels)";
$a->strings["Nobody except yourself"] = "Niemand, behalve jezelf";
$a->strings["Only those you specifically allow"] = "Alleen connecties met uitdrukkelijke toestemming";
$a->strings["Approved connections"] = "Geaccepteerde connecties";
@@ -1956,7 +1985,7 @@ $a->strings["You receive a friend suggestion"] = "Je een kanaalvoorstel ontvangt
$a->strings["You are tagged in a post"] = "Je expliciet in een bericht bent genoemd";
$a->strings["You are poked/prodded/etc. in a post"] = "Je bent in een bericht aangestoten/gepord/etc.";
$a->strings["Show visual notifications including:"] = "Toon de volgende zichtbare notificaties:";
-$a->strings["Unseen matrix activity"] = "Niet bekeken grid-activiteit";
+$a->strings["Unseen grid activity"] = "Niet bekeken grid-activiteit";
$a->strings["Unseen channel activity"] = "Niet bekeken kanaal-activiteit";
$a->strings["Unseen private messages"] = "Niet bekeken privéberichten";
$a->strings["Recommended"] = "Aanbevolen";
@@ -2067,64 +2096,22 @@ $a->strings["The database configuration file \".htconfig.php\" could not be writ
$a->strings["Errors encountered creating database tables."] = "Errors encountered creating database tables.";
$a->strings["<h1>What next</h1>"] = "<h1>Wat nu</h1>";
$a->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.";
-$a->strings["Could not access contact record."] = "Kon geen toegang krijgen tot de connectie-gegevens.";
-$a->strings["Could not locate selected profile."] = "Kon het gekozen profiel niet vinden.";
-$a->strings["Connection updated."] = "Connectie bijgewerkt.";
-$a->strings["Failed to update connection record."] = "Bijwerken van connectie-gegevens mislukt.";
-$a->strings["is now connected to"] = "is nu verbonden met";
-$a->strings["Could not access address book record."] = "Kon geen toegang krijgen tot de record van de connectie.";
-$a->strings["Refresh failed - channel is currently unavailable."] = "Vernieuwen mislukt - kanaal is momenteel niet beschikbaar";
-$a->strings["Unable to set address book parameters."] = "Niet in staat om de parameters van connecties in te stellen.";
-$a->strings["Connection has been removed."] = "Connectie is verwijderd";
-$a->strings["View %s's profile"] = "Profiel van %s weergeven";
-$a->strings["Refresh Permissions"] = "Permissies vernieuwen";
-$a->strings["Fetch updated permissions"] = "Aangepaste permissies ophalen";
-$a->strings["Recent Activity"] = "Kanaal-activiteit";
-$a->strings["View recent posts and comments"] = "Recente berichten en reacties weergeven";
-$a->strings["Block (or Unblock) all communications with this connection"] = "Blokkeer (of deblokkeer) alle communicatie met deze connectie";
-$a->strings["This connection is blocked!"] = "Deze connectie is geblokkeerd!";
-$a->strings["Unignore"] = "Niet meer negeren";
-$a->strings["Ignore (or Unignore) all inbound communications from this connection"] = "Negeer (of negeer niet meer) alle inkomende communicatie van deze connectie";
-$a->strings["This connection is ignored!"] = "Deze connectie wordt genegeerd!";
-$a->strings["Unarchive"] = "Niet meer archiveren";
-$a->strings["Archive"] = "Archiveren";
-$a->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";
-$a->strings["This connection is archived!"] = "Deze connectie is gearchiveerd!";
-$a->strings["Unhide"] = "Niet meer verbergen";
-$a->strings["Hide"] = "Verbergen";
-$a->strings["Hide or Unhide this connection from your other connections"] = "Deze connectie verbergen (of niet meer verbergen) voor jouw andere connecties";
-$a->strings["This connection is hidden!"] = "Deze connectie is verborgen!";
-$a->strings["Delete this connection"] = "Deze connectie verwijderen";
-$a->strings["Approve this connection"] = "Deze connectie accepteren";
-$a->strings["Accept connection to allow communication"] = "Keur deze connectie goed om communicatie toe te staan";
-$a->strings["Set Affinity"] = "Verwantschapsfilter instellen";
-$a->strings["Set Profile"] = "Profiel instellen";
-$a->strings["Set Affinity & Profile"] = "Verwantschapsfilter en profiel instellen";
-$a->strings["none"] = "geen";
-$a->strings["Apply these permissions automatically"] = "Deze permissies automatisch toepassen";
-$a->strings["This connection's primary address is"] = "Het primaire kanaaladres van deze connectie is";
-$a->strings["Available locations:"] = "Beschikbare locaties:";
-$a->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.";
-$a->strings["Slide to adjust your degree of friendship"] = "Schuif om te bepalen hoe goed je iemand kent en/of mag";
-$a->strings["Slide to adjust your rating"] = "Gebruik de schuif om je beoordeling te geven";
-$a->strings["Optionally explain your rating"] = "Verklaar jouw beoordeling (niet verplicht)";
-$a->strings["Custom Filter"] = "Berichtenfilter";
-$a->strings["Only import posts with this text"] = "Importeer alleen berichten met deze tekst";
-$a->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";
-$a->strings["Do not import posts with this text"] = "Importeer geen berichten met deze tekst";
-$a->strings["This information is public!"] = "Deze informatie is openbaar!";
-$a->strings["Connection Pending Approval"] = "Connectie moet nog goedgekeurd worden";
-$a->strings["Connection Request"] = "Connectieverzoek";
-$a->strings["(%s) would like to connect with you. Please approve this connection to allow communication."] = "(%s) wil met jou verbinden. Keur dit connectieverzoek goed om onderling te kunnen communiceren.";
-$a->strings["Approve Later"] = "Later goedkeuren";
-$a->strings["inherited"] = "geërfd";
-$a->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.";
-$a->strings["Their Settings"] = "Hun instellingen";
-$a->strings["My Settings"] = "Mijn instellingen";
-$a->strings["Individual Permissions"] = "Individuele permissies";
-$a->strings["Some permissions may be inherited from your channel's <a href=\"settings\"><strong>privacy settings</strong></a>, which have higher priority than individual settings. You can <strong>not</strong> change those settings here."] = "Sommige permissies worden mogelijk overgeërfd van de <a href=\"settings\">privacy-instellingen</a> van jouw kanaal, die een hogere prioriteit hebben dan deze individuele instellingen. Je kan je deze overgeërfde permissies hier <strong>niet</strong> veranderen.";
-$a->strings["Some permissions may be inherited from your channel's <a href=\"settings\"><strong>privacy settings</strong></a>, which have higher priority than individual settings. You can change those settings here but they wont have any impact unless the inherited setting changes."] = "Sommige permissies worden mogelijk overgeërfd van de <a href=\"settings\">privacy-instellingen</a> 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. ";
-$a->strings["Last update:"] = "Laatste wijziging:";
+$a->strings["No valid account found."] = "Geen geldige account gevonden.";
+$a->strings["Password reset request issued. Check your email."] = "Het verzoek om je wachtwoord opnieuw in te stellen is behandeld. Controleer je e-mail.";
+$a->strings["Site Member (%s)"] = "Lid van hub (%s)";
+$a->strings["Password reset requested at %s"] = "Verzoek tot het opnieuw instellen van een wachtwoord op %s is ingediend";
+$a->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.";
+$a->strings["Password Reset"] = "Wachtwoord vergeten?";
+$a->strings["Your password has been reset as requested."] = "Jouw wachtwoord is opnieuw ingesteld zoals je had verzocht.";
+$a->strings["Your new password is"] = "Jouw nieuwe wachtwoord is";
+$a->strings["Save or copy your new password - and then"] = "Kopieer of sla je nieuwe wachtwoord op - en";
+$a->strings["click here to login"] = "klik dan hier om in te loggen";
+$a->strings["Your password may be changed from the <em>Settings</em> page after successful login."] = "Jouw wachtwoord kan worden veranderd onder <em>instellingen</em>, nadat je succesvol bent ingelogd.";
+$a->strings["Your password has changed at %s"] = "Jouw wachtwoord op %s is veranderd";
+$a->strings["Forgot your Password?"] = "Wachtwoord vergeten?";
+$a->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.";
+$a->strings["Email Address"] = "E-mailadres";
+$a->strings["Reset"] = "Opnieuw instellen";
$a->strings["Files: shared with me"] = "Bestanden: met mij gedeeld";
$a->strings["NEW"] = "NIEUW";
$a->strings["Remove all files"] = "Verwijder alle bestanden";
@@ -2188,6 +2175,7 @@ $a->strings["To select all posts for a given month, such as January of this year
$a->strings["These content files may be imported or restored by visiting <a href=\"%1\$s\">%2\$s</a> 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 <a href=\"%1\$s\">%2\$s</a> te bezoeken. Voor het beste resultaat kan je de bestanden in chronologische volgorde importeren of herstellen.";
$a->strings["No connections."] = "Geen connecties.";
$a->strings["Visit %s's profile [%s]"] = "Bezoek het profiel van %s [%s]";
+$a->strings["View Connections"] = "Connecties weergeven";
$a->strings["Source of Item"] = "Bron van item";
$a->strings["Page Title"] = "Paginatitel";
$a->strings["Xchan Lookup"] = "Xchan opzoeken";
@@ -2228,3 +2216,14 @@ $a->strings["Left align page content"] = "Inhoud links uitlijnen";
$a->strings["Set minimum opacity of nav bar - to hide it"] = "Minimale ondoorzichtigheid navigatiebalk (- om te verbergen)";
$a->strings["Set size of conversation author photo"] = "Grootte profielfoto's van berichten instellen";
$a->strings["Set size of followup author photos"] = "Grootte profielfoto's van reacties instellen";
+$a->strings["Update %s failed. See error logs."] = "Update %s mislukt. Zie foutenlogboek.";
+$a->strings["Update Error at %s"] = "Update-fout op %s";
+$a->strings["Create an account to access services and applications within the Hubzilla"] = "Maak een account aan om toegang te krijgen tot diensten en toepassingen van Hubzilla";
+$a->strings["Password"] = "Wachtwoord";
+$a->strings["Remember me"] = "Aangemeld blijven";
+$a->strings["Forgot your password?"] = "Wachtwoord vergeten?";
+$a->strings["toggle mobile"] = "mobiele weergave omschakelen";
+$a->strings["Website SSL certificate is not valid. Please correct."] = "Het SSL-certificaat van deze website is ongeldig. Corrigeer dit a.u.b.";
+$a->strings["[hubzilla] Website SSL error for %s"] = "[hubzilla] Probleem met SSL-certificaat voor %s";
+$a->strings["Cron/Scheduled tasks not running."] = "Cron is niet actief";
+$a->strings["[hubzilla] Cron tasks not running on %s"] = "[hubzilla] Cron-taken zijn niet actief op %s";
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 5fcf901fb..4ae08dec8 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -310,6 +310,11 @@ footer {
margin-bottom: 0px;
}
+.connect-btn-wrapper {
+ margin-bottom: 10px;
+
+}
+
.profile-edit-side-link {
padding: 3px 0px;
opacity: 0;
@@ -475,53 +480,15 @@ footer {
float: right;
}
-.rconnect {
- display: block;
- color: $nav_active_icon_colour;
- margin-top: 15px;
- background-color: $nav_bg;
- -webkit-border-radius: $radiuspx ;
- -moz-border-radius: $radiuspx;
- border-radius: $radiuspx;
- border: 1px solid $nav_bd;
- padding: 5px;
- font-weight: bold;
- clear: both;
-}
-
-a.rateme, div.rateme {
- display: block;
- color: $nav_active_icon_colour;
- background-color: $nav_bg;
- -webkit-border-radius: $radiuspx ;
- -moz-border-radius: $radiuspx;
- border-radius: $radiuspx;
- border: 1px solid $nav_bd;
- padding: 5px;
- font-weight: bold;
- clear: both;
-}
-
#pause {
position: fixed;
bottom: 5px;
right: 5px;
}
-#vcard-end {
- clear: both;
-}
-
#contact-block {
width: 100%;
float: left;
- background-color: rgba(254,254,254,0.5);
- border-bottom: 1px solid rgba(238,238,238,0.8);
- -moz-border-radius: $radiuspx;
- -webkit-border-radius: $radiuspx;
- border-radius: $radiuspx;
- padding: 10px;
- margin-bottom:10px;
}
#contact-block-numcontacts {
diff --git a/view/theme/redbasic/schema/bluegrid.css b/view/theme/redbasic/schema/bluegrid.css
index f0ae1e8df..38701024f 100644
--- a/view/theme/redbasic/schema/bluegrid.css
+++ b/view/theme/redbasic/schema/bluegrid.css
@@ -160,6 +160,14 @@ nav .badge:hover, nav .badge:focus {
color: rgba(255,255,255,.8);
}
+.widget .conv-participants {
+ color: #BBB;
+}
+
+.widget .active:hover .conv-participants, .widget .active:focus .conv-participants {
+ color: inherit;
+}
+
.help-block, .comment-icon, .jot-icons, .admin-icons {
color: inherit;
}
diff --git a/view/theme/redbasic/schema/dark.css b/view/theme/redbasic/schema/dark.css
index 936f74761..b667dca5c 100644
--- a/view/theme/redbasic/schema/dark.css
+++ b/view/theme/redbasic/schema/dark.css
@@ -10,7 +10,13 @@
}
#profile-photo-wrapper {
- border:none;
+ border: none;
+}
+
+#profile-edit-default-desc {
+ background-color: #665029;
+ color: #FFF;
+ padding: 20px;
}
.photo {
@@ -88,7 +94,7 @@
background-color: #111;
}
-.jotnets-wrapper > a.btn {
+a.btn, aside a {
font-weight: 400 !important;
}
diff --git a/view/theme/redbasic/schema/simple_black_on_white.css b/view/theme/redbasic/schema/simple_black_on_white.css
index f69ba3450..5a6b2655b 100644
--- a/view/theme/redbasic/schema/simple_black_on_white.css
+++ b/view/theme/redbasic/schema/simple_black_on_white.css
@@ -75,6 +75,10 @@
background-color: #fff;
}
+a.btn, aside a {
+ font-weight: 400 !important;
+}
+
.btn-default {
background-color: #fff;
border-color: #000;
diff --git a/view/theme/redbasic/schema/simple_green_on_black.css b/view/theme/redbasic/schema/simple_green_on_black.css
index 1f0a2f1e6..d25585f98 100644
--- a/view/theme/redbasic/schema/simple_green_on_black.css
+++ b/view/theme/redbasic/schema/simple_green_on_black.css
@@ -75,6 +75,10 @@
background-color: #000;
}
+a.btn, aside a {
+ font-weight: 400 !important;
+}
+
.btn-default {
background-color: #000;
border-color: #143D12;
diff --git a/view/theme/redbasic/schema/simple_white_on_black.css b/view/theme/redbasic/schema/simple_white_on_black.css
index 627f3ee5c..277ac7a12 100644
--- a/view/theme/redbasic/schema/simple_white_on_black.css
+++ b/view/theme/redbasic/schema/simple_white_on_black.css
@@ -71,6 +71,10 @@
background-color: #000;
}
+a.btn, aside a {
+ font-weight: 400 !important;
+}
+
.btn-default {
background-color: #000;
border-color: #fff;
diff --git a/view/tpl/channel.tpl b/view/tpl/channel.tpl
index af80e7b4d..23f1e0dd4 100755
--- a/view/tpl/channel.tpl
+++ b/view/tpl/channel.tpl
@@ -7,6 +7,6 @@
{{/if}}
{{/if}}
<a href="{{$channel.link}}" class="channel-selection-photo-link" title="{{$channel.channel_name}}"><img class="channel-photo" src="{{$channel.xchan_photo_m}}" alt="{{$channel.channel_name}}" /></a>
-<div class="channels-notifications-wrapper"><a href='manage/{{$channel.channel_id}}/message' style="{{if $channel.mail != 0}}color:#c60032;{{/if}}" title='{{$channel.mail|string_format:$mail_format}}'><i class="icon-envelope"></i> {{$channel.mail}}</a>&nbsp;<a href='manage/{{$channel.channel_id}}/connections/ifpending' style="{{if $channel.intros != 0}}color:#c60032;{{/if}}" title='{{$channel.intros|string_format:$intros_format}}'><i class="icon-user"></i> {{$channel.intros}}</a></div>
+<div class="channels-notifications-wrapper">{{if $channel.delegate}}{{else}}<a href='manage/{{$channel.channel_id}}/message' style="{{if $channel.mail != 0}}color:#c60032;{{/if}}" title='{{$channel.mail|string_format:$mail_format}}'><i class="icon-envelope"></i> {{$channel.mail}}</a>&nbsp;<a href='manage/{{$channel.channel_id}}/connections/ifpending' style="{{if $channel.intros != 0}}color:#c60032;{{/if}}" title='{{$channel.intros|string_format:$intros_format}}'><i class="icon-user"></i> {{$channel.intros}}</a>{{/if}}</div>
<a href="{{$channel.link}}" class="channel-selection-name-link" title="{{$channel.channel_name}}"><div class="channel-name">{{$channel.channel_name}}</div></a>
</div>
diff --git a/view/tpl/connection_template.tpl b/view/tpl/connection_template.tpl
index 143989971..e2a14d9a2 100755
--- a/view/tpl/connection_template.tpl
+++ b/view/tpl/connection_template.tpl
@@ -1,9 +1,12 @@
<div id="contact-entry-wrapper-{{$contact.id}}">
<div class="section-subtitle-wrapper">
<div class="pull-right">
- {{if $contact.approve}}
+ {{if $contact.approve && $contact.ignore}}
<form action="connedit/{{$contact.id}}" method="post" >
<button type="submit" class="btn btn-success btn-xs" name="pending" value="1" title="{{$contact.approve_hover}}"><i class="icon-ok"></i> {{$contact.approve}}</button>
+
+ <a href="connedit/{{$contact.id}}/ignore" class="btn btn-warning btn-xs" title="{{$contact.ignore_hover}}"><i class="icon-ban-circle"></i> {{$contact.ignore}}</a>
+
{{/if}}
<a href="#" class="btn btn-danger btn-xs" title="{{$contact.delete_hover}}" onclick="dropItem('{{$contact.deletelink}}', '#contact-entry-wrapper-{{$contact.id}}'); return false;"><i class="icon-trash"></i> {{$contact.delete}}</a>
<a href="{{$contact.link}}" class="btn btn-default btn-xs" title="{{$contact.edit_hover}}"><i class="icon-pencil"></i></a>
diff --git a/view/tpl/contact_block.tpl b/view/tpl/contact_block.tpl
index d1ce5ca67..a32437212 100755
--- a/view/tpl/contact_block.tpl
+++ b/view/tpl/contact_block.tpl
@@ -1,7 +1,9 @@
-<div id="contact-block">
-<div id="contact-block-numcontacts">{{$contacts}}</div>
+<div id="contact-block" class="widget">
+<h3>{{$contacts}}</h3>
{{if $micropro}}
+ {{if $viewconnections}}
<a class="allcontact-link" href="viewconnections/{{$nickname}}">{{$viewconnections}}</a>
+ {{/if}}
<div class='contact-block-content'>
{{foreach $micropro as $m}}
{{$m}}
diff --git a/view/tpl/email_notify_html.tpl b/view/tpl/email_notify_html.tpl
index 61ede1ca2..5b4954c8e 100755
--- a/view/tpl/email_notify_html.tpl
+++ b/view/tpl/email_notify_html.tpl
@@ -18,7 +18,7 @@
<tr><td style="font-weight:bold;padding-bottom:5px;">{{$title}}</td></tr>
<tr><td style="padding-right:22px;">{{$htmlversion}}</td></tr>
<tr><td style="padding-top:11px;" colspan="2">{{$hsitelink}}</td></tr>
- <tr><td style="padding-bottom:11px;" colspan="2">{{$hitemlink}}</td></tr>
+ <tr><td style="padding:11px 0;" colspan="2">{{$hitemlink}}</td></tr>
<tr><td></td><td>{{$thanks}}</td></tr>
<tr><td></td><td>{{$site_admin}}</td></tr>
</tbody>
diff --git a/view/tpl/email_notify_text.tpl b/view/tpl/email_notify_text.tpl
index bdab4c273..56925c18b 100755
--- a/view/tpl/email_notify_text.tpl
+++ b/view/tpl/email_notify_text.tpl
@@ -5,6 +5,7 @@
{{$textversion}}
{{$tsitelink}}
+
{{$titemlink}}
{{$thanks}}
diff --git a/view/tpl/group_side.tpl b/view/tpl/group_side.tpl
index 952757076..af6014359 100755
--- a/view/tpl/group_side.tpl
+++ b/view/tpl/group_side.tpl
@@ -16,7 +16,7 @@
</li>
{{/foreach}}
<li>
- <a href="group/new" title="{{$createtext}}" >{{$createtext}}</a>
+ <a href="group/new" title="{{$createtext}}" ><i class="icon-plus-sign"></i> {{$createtext}}</a>
</li>
</ul>
diff --git a/view/tpl/new_channel.tpl b/view/tpl/new_channel.tpl
index 46b32b8a9..156b5ec2f 100755
--- a/view/tpl/new_channel.tpl
+++ b/view/tpl/new_channel.tpl
@@ -22,8 +22,9 @@
<div id="newchannel-name-help" class="descriptive-paragraph">{{$help_name}}</div>
<label for="newchannel-nickname" id="label-newchannel-nickname" class="newchannel-label" >{{$label_nick}}</label>
- <input type="text" name="nickname" id="newchannel-nickname" class="newchannel-input" value="{{$nickname}}" />
+ <input type="text" name="nickname" id="newchannel-nickname" class="newchannel-input" value="{{$nickname}}" />
<div id="nick-spinner"></div>
+ <div id="newchannel-nick-desc" class="descriptive-paragraph">{{$nick_hub}}</div>
<div id="newchannel-nickname-feedback" class="newchannel-feedback"></div>
<div id="newchannel-nickname-end" class="newchannel-field-end"></div>
diff --git a/view/tpl/profile_vcard.tpl b/view/tpl/profile_vcard.tpl
index c52c2cd81..5857ae5d1 100755
--- a/view/tpl/profile_vcard.tpl
+++ b/view/tpl/profile_vcard.tpl
@@ -1,5 +1,8 @@
<div class="vcard">
<div id="profile-photo-wrapper"><img class="photo" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.name}}"></div>
+ {{if $connect}}
+ <div class="connect-btn-wrapper"><a href="{{$connect_url}}" class="btn btn-block btn-success btn-sm"><i class="icon-plus"></i> {{$connect}}</a></div>
+ {{/if}}
{{if $profile.edit}}
<div class="dropdown">
<a class="profile-edit-side-link dropdown-toggle" data-toggle="dropdown" title="{{$profile.edit.3}}" href="#" ><i class="icon-pencil" title="{{$profile.edit.1}}" ></i></a>
@@ -45,16 +48,10 @@
{{if $diaspora}}
{{include file="diaspora_vcard.tpl"}}
{{/if}}
-
-{{if $connect}}
-<a href="{{$connect_url}}" class="rconnect"><i class="icon-plus connect-icon"></i> {{$connect}}</a>
-{{/if}}
-
-{{$rating}}
-
</div>
-<div id="vcard-end"></div>
+<div id="clear"></div>
+{{$rating}}
{{$chanmenu}}
diff --git a/view/tpl/removeaccount.tpl b/view/tpl/removeaccount.tpl
index aefcd51a8..ce6c8ac22 100644
--- a/view/tpl/removeaccount.tpl
+++ b/view/tpl/removeaccount.tpl
@@ -10,7 +10,7 @@
<input type="hidden" name="verify" value="{{$hash}}" />
<div class="form-group" id="remove-account-pass-wrapper">
<label id="remove-account-pass-label" for="remove-account-pass">{{$passwd}}</label>
- <input class="form-control" type="password" id="remove-account-pass" name="qxz_password" />
+ <input class="form-control" type="password" id="remove-account-pass" autocomplete="off" name="qxz_password" value=" " />
</div>
{{include file="field_checkbox.tpl" field=$global}}
<button type="submit" name="submit" class="btn btn-danger">{{$submit}}</button>
diff --git a/view/tpl/removeme.tpl b/view/tpl/removeme.tpl
index 5b329dd6d..40b9546d2 100755
--- a/view/tpl/removeme.tpl
+++ b/view/tpl/removeme.tpl
@@ -10,7 +10,7 @@
<input type="hidden" name="verify" value="{{$hash}}" />
<div class="form-group" id="remove-account-pass-wrapper">
<label id="remove-account-pass-label" for="remove-account-pass">{{$passwd}}</label>
- <input class="form-control" type="password" id="remove-account-pass" name="qxz_password" />
+ <input class="form-control" type="password" id="remove-account-pass" autocomplete="off" name="qxz_password" value=" " />
</div>
{{include file="field_checkbox.tpl" field=$global}}
<button type="submit" name="submit" class="btn btn-danger">{{$submit}}</button>
diff --git a/view/tpl/xchan_vcard.tpl b/view/tpl/xchan_vcard.tpl
index 2acbb24e4..ad409d75b 100755
--- a/view/tpl/xchan_vcard.tpl
+++ b/view/tpl/xchan_vcard.tpl
@@ -1,11 +1,10 @@
<div class="vcard">
<div id="profile-photo-wrapper"><a href="{{$link}}"><img class="vcard-photo photo" src="{{$photo}}" alt="{{$name}}" /></a></div>
+{{if $connect}}
+<div class="connect-btn-wrapper"><a href="follow?f=&url={{$follow}}" class="btn btn-block btn-success btn-sm"><i class="icon-plus"></i> {{$connect}}</a></div>
+{{/if}}
<div class="fn">{{$name}}</div>
</div>
-{{if $mode != 'mail'}}
-{{if $connect}}
- <a href="follow?f=&url={{$follow}}" class="rconnect"><i class="icon-plus connect-icon"></i> {{$connect}}</a>
-{{/if}}
-{{/if}}
+